diff --git a/android/Pubnub-Android-3.5.2.jar b/android/Pubnub-Android-3.5.2.jar index 76706b143..8955dbc94 100644 Binary files a/android/Pubnub-Android-3.5.2.jar and b/android/Pubnub-Android-3.5.2.jar differ diff --git a/android/examples/PubnubExample/libs/Pubnub-Android-3.5.2.jar b/android/examples/PubnubExample/libs/Pubnub-Android-3.5.2.jar index 76706b143..8955dbc94 100644 Binary files a/android/examples/PubnubExample/libs/Pubnub-Android-3.5.2.jar and b/android/examples/PubnubExample/libs/Pubnub-Android-3.5.2.jar differ diff --git a/android/examples/SubscribeAtBoot/libs/Pubnub-Android-3.5.2.jar b/android/examples/SubscribeAtBoot/libs/Pubnub-Android-3.5.2.jar index 76706b143..8955dbc94 100644 Binary files a/android/examples/SubscribeAtBoot/libs/Pubnub-Android-3.5.2.jar and b/android/examples/SubscribeAtBoot/libs/Pubnub-Android-3.5.2.jar differ diff --git a/blackberry/Pubnub-BlackBerry-3.5.2.jar b/blackberry/Pubnub-BlackBerry-3.5.2.jar index 0b79ce1a5..16c53e788 100644 Binary files a/blackberry/Pubnub-BlackBerry-3.5.2.jar and b/blackberry/Pubnub-BlackBerry-3.5.2.jar differ diff --git a/j2me/Pubnub-MicroEdition-3.5.2.jar b/j2me/Pubnub-MicroEdition-3.5.2.jar index 1635798ba..6ece1223e 100644 Binary files a/j2me/Pubnub-MicroEdition-3.5.2.jar and b/j2me/Pubnub-MicroEdition-3.5.2.jar differ diff --git a/java/Pubnub-StandardEdition-3.5.2.jar b/java/Pubnub-StandardEdition-3.5.2.jar index feff23746..b567a5513 100644 Binary files a/java/Pubnub-StandardEdition-3.5.2.jar and b/java/Pubnub-StandardEdition-3.5.2.jar differ diff --git a/java/doc/allclasses-frame.html b/java/doc/allclasses-frame.html index e22ac58f6..dfe580664 100644 --- a/java/doc/allclasses-frame.html +++ b/java/doc/allclasses-frame.html @@ -2,7 +2,7 @@ - + All Classes diff --git a/java/doc/allclasses-noframe.html b/java/doc/allclasses-noframe.html index 605f22bc8..0e2a2023e 100644 --- a/java/doc/allclasses-noframe.html +++ b/java/doc/allclasses-noframe.html @@ -2,7 +2,7 @@ - + All Classes diff --git a/java/doc/com/pubnub/api/Callback.html b/java/doc/com/pubnub/api/Callback.html index bedbeeffd..5e720e000 100644 --- a/java/doc/com/pubnub/api/Callback.html +++ b/java/doc/com/pubnub/api/Callback.html @@ -2,7 +2,7 @@ - + Callback diff --git a/java/doc/com/pubnub/api/Pubnub.html b/java/doc/com/pubnub/api/Pubnub.html index 484a42b75..3b1db8f38 100644 --- a/java/doc/com/pubnub/api/Pubnub.html +++ b/java/doc/com/pubnub/api/Pubnub.html @@ -2,7 +2,7 @@ - + Pubnub diff --git a/java/doc/com/pubnub/api/PubnubError.html b/java/doc/com/pubnub/api/PubnubError.html index a25ffdeec..77e3470af 100644 --- a/java/doc/com/pubnub/api/PubnubError.html +++ b/java/doc/com/pubnub/api/PubnubError.html @@ -2,7 +2,7 @@ - + PubnubError diff --git a/java/doc/com/pubnub/api/PubnubException.html b/java/doc/com/pubnub/api/PubnubException.html index a6c41ec06..f66332271 100644 --- a/java/doc/com/pubnub/api/PubnubException.html +++ b/java/doc/com/pubnub/api/PubnubException.html @@ -2,7 +2,7 @@ - + PubnubException diff --git a/java/doc/com/pubnub/api/PubnubUtil.html b/java/doc/com/pubnub/api/PubnubUtil.html index ca21dbe97..139336b8e 100644 --- a/java/doc/com/pubnub/api/PubnubUtil.html +++ b/java/doc/com/pubnub/api/PubnubUtil.html @@ -2,7 +2,7 @@ - + PubnubUtil diff --git a/java/doc/com/pubnub/api/package-frame.html b/java/doc/com/pubnub/api/package-frame.html index 757183cdc..44973baf8 100644 --- a/java/doc/com/pubnub/api/package-frame.html +++ b/java/doc/com/pubnub/api/package-frame.html @@ -2,7 +2,7 @@ - + com.pubnub.api diff --git a/java/doc/com/pubnub/api/package-summary.html b/java/doc/com/pubnub/api/package-summary.html index 0c529f6b3..2fb75c9a0 100644 --- a/java/doc/com/pubnub/api/package-summary.html +++ b/java/doc/com/pubnub/api/package-summary.html @@ -2,7 +2,7 @@ - + com.pubnub.api diff --git a/java/doc/com/pubnub/api/package-tree.html b/java/doc/com/pubnub/api/package-tree.html index a8cca9a83..786d1017f 100644 --- a/java/doc/com/pubnub/api/package-tree.html +++ b/java/doc/com/pubnub/api/package-tree.html @@ -2,7 +2,7 @@ - + com.pubnub.api Class Hierarchy diff --git a/java/doc/constant-values.html b/java/doc/constant-values.html index 9b09123b3..0ab37ae9c 100644 --- a/java/doc/constant-values.html +++ b/java/doc/constant-values.html @@ -2,7 +2,7 @@ - + Constant Field Values diff --git a/java/doc/deprecated-list.html b/java/doc/deprecated-list.html index ada8bc5e1..92d9d3022 100644 --- a/java/doc/deprecated-list.html +++ b/java/doc/deprecated-list.html @@ -2,7 +2,7 @@ - + Deprecated List diff --git a/java/doc/help-doc.html b/java/doc/help-doc.html index b4319471b..51603df5d 100644 --- a/java/doc/help-doc.html +++ b/java/doc/help-doc.html @@ -2,7 +2,7 @@ - + API Help diff --git a/java/doc/index-all.html b/java/doc/index-all.html index 666ca3b7d..14ae0f7fd 100644 --- a/java/doc/index-all.html +++ b/java/doc/index-all.html @@ -2,7 +2,7 @@ - + Index diff --git a/java/doc/index.html b/java/doc/index.html index 113d95995..555a2337b 100644 --- a/java/doc/index.html +++ b/java/doc/index.html @@ -2,7 +2,7 @@ - + Generated Documentation (Untitled) diff --git a/java/doc/overview-tree.html b/java/doc/overview-tree.html index a012862be..32cc982d9 100644 --- a/java/doc/overview-tree.html +++ b/java/doc/overview-tree.html @@ -2,7 +2,7 @@ - + Class Hierarchy diff --git a/java/doc/serialized-form.html b/java/doc/serialized-form.html index 2e8a22d4a..83003ad10 100644 --- a/java/doc/serialized-form.html +++ b/java/doc/serialized-form.html @@ -2,7 +2,7 @@ - + Serialized Form diff --git a/java/jars/Pubnub-UnitTests-3.5.2.jar b/java/jars/Pubnub-UnitTests-3.5.2.jar index 124bcb8ce..1cc5547a9 100644 Binary files a/java/jars/Pubnub-UnitTests-3.5.2.jar and b/java/jars/Pubnub-UnitTests-3.5.2.jar differ diff --git a/java/jars/PubnubDemoConsole.jar b/java/jars/PubnubDemoConsole.jar index d0a53bae5..dfef1e998 100644 Binary files a/java/jars/PubnubDemoConsole.jar and b/java/jars/PubnubDemoConsole.jar differ diff --git a/java/jars/PubnubExample.jar b/java/jars/PubnubExample.jar index 6d1049ca9..75753382f 100644 Binary files a/java/jars/PubnubExample.jar and b/java/jars/PubnubExample.jar differ diff --git a/java/src1/com/pubnub/api/SubscribeWorker.java b/java/src1/com/pubnub/api/SubscribeWorker.java index fb979ebf2..7b144c5ba 100644 --- 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 index 574036f66..5366a27d3 100644 --- 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; } -} \ No newline at end of file +} diff --git a/scala/src/com/pubnub/examples/PubnubDevConsole.scala b/scala/src/com/pubnub/examples/PubnubDevConsole.scala index be91aa747..0abd10798 100644 --- 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 _ => {} } } })