changed the sleep conditions in subscribe worker

yishai-glide · Jul 8, 2013 · f6eef49 · f6eef49
1 parent e404d40
commit f6eef49
Show file tree

Hide file tree

Showing 28 changed files with 52 additions and 45 deletions.
diff --git a/android/Pubnub-Android-3.5.2.jar b/android/Pubnub-Android-3.5.2.jar
diff --git a/android/examples/PubnubExample/libs/Pubnub-Android-3.5.2.jar b/android/examples/PubnubExample/libs/Pubnub-Android-3.5.2.jar
diff --git a/android/examples/SubscribeAtBoot/libs/Pubnub-Android-3.5.2.jar b/android/examples/SubscribeAtBoot/libs/Pubnub-Android-3.5.2.jar
diff --git a/blackberry/Pubnub-BlackBerry-3.5.2.jar b/blackberry/Pubnub-BlackBerry-3.5.2.jar
diff --git a/j2me/Pubnub-MicroEdition-3.5.2.jar b/j2me/Pubnub-MicroEdition-3.5.2.jar
diff --git a/java/Pubnub-StandardEdition-3.5.2.jar b/java/Pubnub-StandardEdition-3.5.2.jar
diff --git a/java/doc/allclasses-frame.html b/java/doc/allclasses-frame.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Sun Jul 07 00:29:20 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 08 17:20:03 IST 2013 -->
 <TITLE>
 All Classes
 </TITLE>
 
-<META NAME="date" CONTENT="2013-07-07">
+<META NAME="date" CONTENT="2013-07-08">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 

diff --git a/java/doc/allclasses-noframe.html b/java/doc/allclasses-noframe.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Sun Jul 07 00:29:20 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 08 17:20:03 IST 2013 -->
 <TITLE>
 All Classes
 </TITLE>
 
-<META NAME="date" CONTENT="2013-07-07">
+<META NAME="date" CONTENT="2013-07-08">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 

diff --git a/java/doc/com/pubnub/api/Callback.html b/java/doc/com/pubnub/api/Callback.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Sun Jul 07 00:29:17 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 08 17:20:02 IST 2013 -->
 <TITLE>
 Callback
 </TITLE>
 
-<META NAME="date" CONTENT="2013-07-07">
+<META NAME="date" CONTENT="2013-07-08">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
 

diff --git a/java/doc/com/pubnub/api/Pubnub.html b/java/doc/com/pubnub/api/Pubnub.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Sun Jul 07 00:29:17 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 08 17:20:03 IST 2013 -->
 <TITLE>
 Pubnub
 </TITLE>
 
-<META NAME="date" CONTENT="2013-07-07">
+<META NAME="date" CONTENT="2013-07-08">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
 

diff --git a/java/doc/com/pubnub/api/PubnubError.html b/java/doc/com/pubnub/api/PubnubError.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Sun Jul 07 00:29:18 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 08 17:20:03 IST 2013 -->
 <TITLE>
 PubnubError
 </TITLE>
 
-<META NAME="date" CONTENT="2013-07-07">
+<META NAME="date" CONTENT="2013-07-08">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
 

diff --git a/java/doc/com/pubnub/api/PubnubException.html b/java/doc/com/pubnub/api/PubnubException.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Sun Jul 07 00:29:19 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 08 17:20:03 IST 2013 -->
 <TITLE>
 PubnubException
 </TITLE>
 
-<META NAME="date" CONTENT="2013-07-07">
+<META NAME="date" CONTENT="2013-07-08">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
 

diff --git a/java/doc/com/pubnub/api/PubnubUtil.html b/java/doc/com/pubnub/api/PubnubUtil.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Sun Jul 07 00:29:19 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 08 17:20:03 IST 2013 -->
 <TITLE>
 PubnubUtil
 </TITLE>
 
-<META NAME="date" CONTENT="2013-07-07">
+<META NAME="date" CONTENT="2013-07-08">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
 

diff --git a/java/doc/com/pubnub/api/package-frame.html b/java/doc/com/pubnub/api/package-frame.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Sun Jul 07 00:29:19 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 08 17:20:03 IST 2013 -->
 <TITLE>
 com.pubnub.api
 </TITLE>
 
-<META NAME="date" CONTENT="2013-07-07">
+<META NAME="date" CONTENT="2013-07-08">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
 

diff --git a/java/doc/com/pubnub/api/package-summary.html b/java/doc/com/pubnub/api/package-summary.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Sun Jul 07 00:29:19 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 08 17:20:03 IST 2013 -->
 <TITLE>
 com.pubnub.api
 </TITLE>
 
-<META NAME="date" CONTENT="2013-07-07">
+<META NAME="date" CONTENT="2013-07-08">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
 

diff --git a/java/doc/com/pubnub/api/package-tree.html b/java/doc/com/pubnub/api/package-tree.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Sun Jul 07 00:29:20 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 08 17:20:03 IST 2013 -->
 <TITLE>
 com.pubnub.api Class Hierarchy
 </TITLE>
 
-<META NAME="date" CONTENT="2013-07-07">
+<META NAME="date" CONTENT="2013-07-08">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
 

diff --git a/java/doc/constant-values.html b/java/doc/constant-values.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Sun Jul 07 00:29:20 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 08 17:20:03 IST 2013 -->
 <TITLE>
 Constant Field Values
 </TITLE>
 
-<META NAME="date" CONTENT="2013-07-07">
+<META NAME="date" CONTENT="2013-07-08">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 

diff --git a/java/doc/deprecated-list.html b/java/doc/deprecated-list.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Sun Jul 07 00:29:20 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 08 17:20:03 IST 2013 -->
 <TITLE>
 Deprecated List
 </TITLE>
 
-<META NAME="date" CONTENT="2013-07-07">
+<META NAME="date" CONTENT="2013-07-08">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 

diff --git a/java/doc/help-doc.html b/java/doc/help-doc.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Sun Jul 07 00:29:20 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 08 17:20:04 IST 2013 -->
 <TITLE>
 API Help
 </TITLE>
 
-<META NAME="date" CONTENT="2013-07-07">
+<META NAME="date" CONTENT="2013-07-08">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 

diff --git a/java/doc/index-all.html b/java/doc/index-all.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Sun Jul 07 00:29:20 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 08 17:20:03 IST 2013 -->
 <TITLE>
 Index
 </TITLE>
 
-<META NAME="date" CONTENT="2013-07-07">
+<META NAME="date" CONTENT="2013-07-08">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="./stylesheet.css" TITLE="Style">
 

diff --git a/java/doc/index.html b/java/doc/index.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc on Sun Jul 07 00:29:20 IST 2013-->
+<!-- Generated by javadoc on Mon Jul 08 17:20:03 IST 2013-->
 <TITLE>
 Generated Documentation (Untitled)
 </TITLE>

diff --git a/java/doc/overview-tree.html b/java/doc/overview-tree.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Sun Jul 07 00:29:20 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 08 17:20:03 IST 2013 -->
 <TITLE>
 Class Hierarchy
 </TITLE>
 
-<META NAME="date" CONTENT="2013-07-07">
+<META NAME="date" CONTENT="2013-07-08">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 

diff --git a/java/doc/serialized-form.html b/java/doc/serialized-form.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Sun Jul 07 00:29:20 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 08 17:20:03 IST 2013 -->
 <TITLE>
 Serialized Form
 </TITLE>
 
-<META NAME="date" CONTENT="2013-07-07">
+<META NAME="date" CONTENT="2013-07-08">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 

diff --git a/java/jars/Pubnub-UnitTests-3.5.2.jar b/java/jars/Pubnub-UnitTests-3.5.2.jar
diff --git a/java/jars/PubnubDemoConsole.jar b/java/jars/PubnubDemoConsole.jar
diff --git a/java/jars/PubnubExample.jar b/java/jars/PubnubExample.jar
diff --git a/java/src1/com/pubnub/api/SubscribeWorker.java b/java/src1/com/pubnub/api/SubscribeWorker.java
@@ -28,6 +28,12 @@ void process(HttpRequest hreq) {
         }
         hreq.setWorker(this);
         while (!_die && currentRetryAttempt <= maxRetries) {
+            if ( currentRetryAttempt > 1 ) {
+                try {
+                    Thread.sleep(retryInterval);
+                } catch (InterruptedException e) {
+                }
+            }
             try {
                 log.debug(hreq.getUrl());
                 hresp = httpclient.fetch(hreq.getUrl(), hreq.getHeaders());
@@ -55,7 +61,7 @@ void process(HttpRequest hreq) {
                 case PNERR_FORBIDDEN:
                 case PNERR_UNAUTHORIZED:
                     log.verbose("Authentication Failure : " + e.toString());
-                    currentRetryAttempt++;
+                    currentRetryAttempt = maxRetries + 1;
                     break;
                 default:
                     log.verbose("Retry Attempt : " + ((currentRetryAttempt == maxRetries)?"last":currentRetryAttempt)
@@ -71,10 +77,6 @@ void process(HttpRequest hreq) {
                 currentRetryAttempt++;
             }
 
-            try {
-                Thread.sleep(retryInterval);
-            } catch (InterruptedException e) {
-            }
         }
         if (!_die) {
             if (hresp == null) {

diff --git a/scala/src/com/pubnub/examples/PubnubDevConsole.scala b/scala/src/com/pubnub/examples/PubnubDevConsole.scala
@@ -1,8 +1,9 @@
-package com.pubnub.examples
+//package com.pubnub.examples
 
 import com.pubnub.api._
 import java.util._
 import org.json._
+import java.lang.Integer
 
 object PubnubDevConsole {
   var pub_key = ""
@@ -105,6 +106,10 @@ object PubnubDevConsole {
         override def errorCallback(channel: String, error: PubnubError) {
           notifyUser("SUBSCRIBE : ERROR on channel " + channel
             + " : " + error.toString())
+          error.errorCode match {
+              case PubnubError.PNERR_FORBIDDEN => { pubnub.unsubscribe(channel); println("forbidden");}
+              case PubnubError.PNERR_UNAUTHORIZED => {pubnub.unsubscribe(channel); println("unauthorized");}
+          } 
         }
       })
 
@@ -198,9 +203,9 @@ object PubnubDevConsole {
 
     }
   }
-  def detailedHistory(channel: String) {
+  def history(channel: String) {
 
-    pubnub.detailedHistory(channel, 2, new Callback() {
+    pubnub.history(channel, 2, new Callback() {
       override def successCallback(channel: String, message: Object) {
         notifyUser("DETAILED HISTORY : " + message)
       }
@@ -312,7 +317,7 @@ object PubnubDevConsole {
     if (sec_key.length() == 0)
       sec_key = getStringFromConsole("Secret Key", true)
 
-    if (cip_key.length() == 0)
+    if (cip_key.trim().length() == 0)
       cip_key = getStringFromConsole("Cipher Key", true)
 
     pubnub = new Pubnub(pub_key, sub_key, sec_key, cip_key, SSL)
@@ -342,7 +347,7 @@ object PubnubDevConsole {
           presence(channelName)
         case 4 =>
           channelName = getStringFromConsole("Channel Name")
-          detailedHistory(channelName)
+          history(channelName)
         case 5 =>
           channelName = getStringFromConsole("Channel Name")
           hereNow(channelName)
@@ -408,7 +413,7 @@ object PubnubDevConsole {
       + pubnub.getCurrentlySubscribedChannelNames() + ")")
     println("ENTER 2  FOR Publish")
     println("ENTER 3  FOR Presence")
-    println("ENTER 4  FOR Detailed History")
+    println("ENTER 4  FOR History")
     println("ENTER 5  FOR Here_Now")
     println("ENTER 6  FOR Unsubscribe")
     println("ENTER 7  FOR Presence-Unsubscribe")
@@ -443,4 +448,4 @@ object PubnubDevConsole {
     startDemo
     pubnub.shutdown()
   }
-}
+}