Distinguish 'read timed out', and add a state for APIConnectionExcepiton

Author: Javen

src/cn/jpush/api/common/APIConnectionException.java

@@ -1,19 +1,31 @@
 package cn.jpush.api.common;
 
 /**
- * Should retry for encountering this exception
+ * Should retry for encountering this exception basically. 
+ * Normally it is due to:
+ * 1. Connect timed out.
+ * 2. Read timed out.
+ * 3. Cannot parse domain.
+ * 
+ * For Push action, if the exception is "Read timed out" you may not want to retry it.
  */
 public class APIConnectionException extends Exception {
     private static final long serialVersionUID = -2615370590441195647L;
+    private boolean readTimedout = false;
 
     public APIConnectionException(String message, Throwable e) {
         super(message, e);
     }
 
-    public APIConnectionException(Throwable e) {
-        super(e);
+    public APIConnectionException(String message, Throwable e, boolean readTimedout) {
+        super(message, e);
+        this.readTimedout = readTimedout;
     }
 
-
+    public boolean isReadTimedout() {
+        return readTimedout;
+    }
+    
 }
 
+

src/cn/jpush/api/common/IHttpClient.java

@@ -27,6 +27,16 @@ public enum RequestMethod {
             + "Please ensure your internet connection is ok. \n"
             + "If the problem persists, please let us know at support@jpush.cn.";
 
+    public static final String CONNECT_TIMED_OUT_MESSAGE = "connect timed out. \n"
+            + "Connect to JPush Server timed out, and already retried three times. "
+            + "Please ensure your internet connection is ok. \n"
+            + "If the problem persists, please let us know at support@jpush.cn.";
+
+    public static final String READ_TIMED_OUT_MESSAGE = "Read timed out. \n"
+            + "Read response from JPush Server timed out. For Push action, maybe you could not retry. "
+            + "Maybe JPush server is a little slowly. \n"
+            + "If the problem persists, please let us know at support@jpush.cn.";
+
     public static Gson _gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
 
 

src/cn/jpush/api/common/NativeHttpClient.java

@@ -22,6 +22,8 @@
 
 public class NativeHttpClient implements IHttpClient {
     private static final Logger LOG = LoggerFactory.getLogger(NativeHttpClient.class);
+    private static final String KEYWORDS_CONNECT_TIMED_OUT = "connect timed out";
+    private static final String KEYWORDS_READ_TIMED_OUT = "Read timed out";
 
     private int _maxRetryTimes = 0;
 
@@ -53,11 +55,16 @@ public ResponseWrapper sendRequest(String url, String content,
             try {
                 response = _sendRequest(url, content, method, authCode);
                 break;
-            } catch (SocketTimeoutException e) {    // connect timed out
-                if (retryTimes >= _maxRetryTimes) {
-                    throw new APIConnectionException(e);
-                } else {
-                    LOG.debug("connect timed out - retry again - " + (retryTimes + 1));
+            } catch (SocketTimeoutException e) {
+                if (KEYWORDS_READ_TIMED_OUT.equals(e.getMessage())) {
+                    // Read timed out.  For push, maybe should not re-send.
+                    throw new APIConnectionException(READ_TIMED_OUT_MESSAGE, e, true);
+                } else {    // connect timed out
+                    if (retryTimes >= _maxRetryTimes) {
+                        throw new APIConnectionException(CONNECT_TIMED_OUT_MESSAGE, e);
+                    } else {
+                        LOG.debug("connect timed out - retry again - " + (retryTimes + 1));
+                    }
                 }
             }
         }
@@ -169,8 +176,10 @@ private ResponseWrapper _sendRequest(String url, String content,
 			}
 
 		} catch (SocketTimeoutException e) {
-		    if (e.getMessage().contains("connect timed out")) {
+		    if (e.getMessage().contains(KEYWORDS_CONNECT_TIMED_OUT)) {
 	            throw e;
+		    } else if (e.getMessage().contains(KEYWORDS_READ_TIMED_OUT)) {
+		        throw new SocketTimeoutException(KEYWORDS_READ_TIMED_OUT);
 		    }
             LOG.debug(IO_ERROR_MESSAGE, e);
 		    throw new APIConnectionException(IO_ERROR_MESSAGE, e);