adding sockettimeout exception code to HttpClientCore

yishai-glide · Oct 26, 2013 · c4f1beb · c4f1beb
1 parent a9f7a45
commit c4f1beb
Show file tree

Hide file tree

Showing 29 changed files with 22 additions and 19 deletions.
diff --git a/android/Pubnub-Android-3.5.5.jar b/android/Pubnub-Android-3.5.5.jar
diff --git a/android/examples/PubnubExample/libs/Pubnub-Android-3.5.5.jar b/android/examples/PubnubExample/libs/Pubnub-Android-3.5.5.jar
diff --git a/android/examples/SubscribeAtBoot/libs/Pubnub-Android-3.5.5.jar b/android/examples/SubscribeAtBoot/libs/Pubnub-Android-3.5.5.jar
diff --git a/blackberry/Pubnub-BlackBerry-3.5.5.jar b/blackberry/Pubnub-BlackBerry-3.5.5.jar
diff --git a/codenameone/Pubnub-CodeNameOne-3.5.5.cn1lib b/codenameone/Pubnub-CodeNameOne-3.5.5.cn1lib
diff --git a/j2me/Pubnub-MicroEdition-3.5.5.jar b/j2me/Pubnub-MicroEdition-3.5.5.jar
diff --git a/java/Pubnub-StandardEdition-3.5.5.jar b/java/Pubnub-StandardEdition-3.5.5.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 Sun Oct 27 01:39:36 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Sun Oct 27 02:57:12 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 Sun Oct 27 01:39:36 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Sun Oct 27 02:57:12 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 Sun Oct 27 01:39:34 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Sun Oct 27 02:57:11 IST 2013 -->
 <TITLE>
 Callback
 </TITLE>

diff --git a/java/doc/com/pubnub/api/HttpUtil.html b/java/doc/com/pubnub/api/HttpUtil.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_37) on Sun Oct 27 01:39:35 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Sun Oct 27 02:57:12 IST 2013 -->
 <TITLE>
 HttpUtil
 </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 Sun Oct 27 01:39:35 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Sun Oct 27 02:57:12 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 Sun Oct 27 01:39:35 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Sun Oct 27 02:57:12 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 Sun Oct 27 01:39:35 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Sun Oct 27 02:57:12 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 Sun Oct 27 01:39:35 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Sun Oct 27 02:57:12 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 Sun Oct 27 01:39:35 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Sun Oct 27 02:57:12 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 Sun Oct 27 01:39:35 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Sun Oct 27 02:57:12 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 Sun Oct 27 01:39:35 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Sun Oct 27 02:57:12 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 Sun Oct 27 01:39:36 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Sun Oct 27 02:57:12 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 Sun Oct 27 01:39:36 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Sun Oct 27 02:57:12 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 Sun Oct 27 01:39:36 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Sun Oct 27 02:57:12 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 Sun Oct 27 01:39:36 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Sun Oct 27 02:57:12 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 Sun Oct 27 01:39:36 IST 2013-->
+<!-- Generated by javadoc on Sun Oct 27 02:57:12 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 Sun Oct 27 01:39:36 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Sun Oct 27 02:57:12 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 Sun Oct 27 01:39:36 IST 2013 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Sun Oct 27 02:57:12 IST 2013 -->
 <TITLE>
 Serialized Form
 </TITLE>

diff --git a/java/jars/Pubnub-UnitTests-3.5.5.jar b/java/jars/Pubnub-UnitTests-3.5.5.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/HttpClientCore.java b/java/src1/com/pubnub/api/HttpClientCore.java
@@ -134,7 +134,10 @@ public synchronized HttpResponse fetch(String url, Hashtable headers)
         int rc = HttpURLConnection.HTTP_INTERNAL_ERROR;
         try {
             rc = connection.getResponseCode();
-        } catch (IOException e) {
+        } catch (SocketTimeoutException ste) {
+        	throw ste;
+        }
+        catch (IOException e) {
             throw new PubnubException(getErrorObject(PNERROBJ_HTTP_RC_ERROR, url + " : " + e.toString()));
         }