fixes for demo

yishai-glide · Jul 8, 2013 · 42a30b8 · 42a30b8
1 parent 9fa99cc
commit 42a30b8
Show file tree

Hide file tree

Showing 29 changed files with 23 additions and 20 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,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 08 17:20:03 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 08 21:26:48 IST 2013 -->
 <TITLE>
 All Classes
 </TITLE>

diff --git a/java/doc/allclasses-noframe.html b/java/doc/allclasses-noframe.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 08 17:20:03 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 08 21:26:48 IST 2013 -->
 <TITLE>
 All Classes
 </TITLE>

diff --git a/java/doc/com/pubnub/api/Callback.html b/java/doc/com/pubnub/api/Callback.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 08 17:20:02 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 08 21:26:47 IST 2013 -->
 <TITLE>
 Callback
 </TITLE>

diff --git a/java/doc/com/pubnub/api/Pubnub.html b/java/doc/com/pubnub/api/Pubnub.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 08 17:20:03 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 08 21:26:47 IST 2013 -->
 <TITLE>
 Pubnub
 </TITLE>

diff --git a/java/doc/com/pubnub/api/PubnubError.html b/java/doc/com/pubnub/api/PubnubError.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 08 17:20:03 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 08 21:26:48 IST 2013 -->
 <TITLE>
 PubnubError
 </TITLE>

diff --git a/java/doc/com/pubnub/api/PubnubException.html b/java/doc/com/pubnub/api/PubnubException.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 08 17:20:03 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 08 21:26:48 IST 2013 -->
 <TITLE>
 PubnubException
 </TITLE>

diff --git a/java/doc/com/pubnub/api/PubnubUtil.html b/java/doc/com/pubnub/api/PubnubUtil.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 08 17:20:03 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 08 21:26:48 IST 2013 -->
 <TITLE>
 PubnubUtil
 </TITLE>

diff --git a/java/doc/com/pubnub/api/package-frame.html b/java/doc/com/pubnub/api/package-frame.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 08 17:20:03 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 08 21:26:48 IST 2013 -->
 <TITLE>
 com.pubnub.api
 </TITLE>

diff --git a/java/doc/com/pubnub/api/package-summary.html b/java/doc/com/pubnub/api/package-summary.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 08 17:20:03 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 08 21:26:48 IST 2013 -->
 <TITLE>
 com.pubnub.api
 </TITLE>

diff --git a/java/doc/com/pubnub/api/package-tree.html b/java/doc/com/pubnub/api/package-tree.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 08 17:20:03 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 08 21:26:48 IST 2013 -->
 <TITLE>
 com.pubnub.api Class Hierarchy
 </TITLE>

diff --git a/java/doc/constant-values.html b/java/doc/constant-values.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 08 17:20:03 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 08 21:26:48 IST 2013 -->
 <TITLE>
 Constant Field Values
 </TITLE>

diff --git a/java/doc/deprecated-list.html b/java/doc/deprecated-list.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 08 17:20:03 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 08 21:26:48 IST 2013 -->
 <TITLE>
 Deprecated List
 </TITLE>

diff --git a/java/doc/help-doc.html b/java/doc/help-doc.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 08 17:20:04 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 08 21:26:48 IST 2013 -->
 <TITLE>
 API Help
 </TITLE>

diff --git a/java/doc/index-all.html b/java/doc/index-all.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 08 17:20:03 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 08 21:26:48 IST 2013 -->
 <TITLE>
 Index
 </TITLE>

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

diff --git a/java/doc/overview-tree.html b/java/doc/overview-tree.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 08 17:20:03 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 08 21:26:48 IST 2013 -->
 <TITLE>
 Class Hierarchy
 </TITLE>

diff --git a/java/doc/serialized-form.html b/java/doc/serialized-form.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 08 17:20:03 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Jul 08 21:26:48 IST 2013 -->
 <TITLE>
 Serialized Form
 </TITLE>

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
@@ -27,12 +27,14 @@ void process(HttpRequest hreq) {
             }
         }
         hreq.setWorker(this);
+        boolean sleep = false;
         while (!_die && currentRetryAttempt <= maxRetries) {
-            if ( currentRetryAttempt > 1 ) {
+            if (sleep) {
                 try {
                     Thread.sleep(retryInterval);
                 } catch (InterruptedException e) {
                 }
+                sleep = true;
             }
             try {
                 log.debug(hreq.getUrl());

diff --git a/java/srcPubnubApi/com/pubnub/api/RequestManager.java b/java/srcPubnubApi/com/pubnub/api/RequestManager.java
@@ -326,4 +326,4 @@ public void setRetryInterval(int retryInterval) {
         this.retryInterval = retryInterval;
     }
 
-}
+}
diff --git a/scala/src/com/pubnub/examples/PubnubDevConsole.scala b/scala/src/com/pubnub/examples/PubnubDevConsole.scala
@@ -12,7 +12,7 @@ object PubnubDevConsole {
   var cip_key = ""
   var SSL = false
   var reader: Scanner = null
-  var pubnub = new Pubnub(pub_key, sub_key)
+  var pubnub: Pubnub = null 
 
   def getStringFromConsole(message: String, optional: Boolean = false): String = {
 
@@ -109,6 +109,7 @@ object PubnubDevConsole {
           error.errorCode match {
               case PubnubError.PNERR_FORBIDDEN => { pubnub.unsubscribe(channel);}
               case PubnubError.PNERR_UNAUTHORIZED => {pubnub.unsubscribe(channel);}
+              case _ => {}
           } 
         }
       })
-Original file line number
+Diff line change
@@ Expand Up / @@ -326,4 +326,4 @@ public void setRetryInterval(int retryInterval) { @@
             this.retryInterval = retryInterval;
         }
-    }
+    }