修复不能准确抛出网络异常的bug

Author: litesuits

apache-client/src/main/java/com/litesuits/http/impl/apache/ApacheClient.java

@@ -5,9 +5,7 @@
 import com.litesuits.http.HttpConfig;
 import com.litesuits.http.data.*;
 import com.litesuits.http.data.HttpStatus;
-import com.litesuits.http.exception.HttpClientException;
-import com.litesuits.http.exception.HttpServerException;
-import com.litesuits.http.exception.ServerException;
+import com.litesuits.http.exception.*;
 import com.litesuits.http.listener.StatisticsListener;
 import com.litesuits.http.log.HttpLog;
 import com.litesuits.http.parser.DataParser;
@@ -239,14 +237,15 @@ public <T> void connect(AbstractRequest<T> request, InternalResponse response) t
                 }
                 response.setHeaders(hs);
             }
-            // 成功
-            entity = ares.getEntity();
 
             // is cancelled ?
             if (request.isCancelledOrInterrupted()) {
                 return;
             }
 
+            // 成功
+            entity = ares.getEntity();
+
             // data body
             if (status.getStatusCode() <= 299 || status.getStatusCode() == 600) {
                 if (entity != null) {
@@ -267,6 +266,8 @@ public <T> void connect(AbstractRequest<T> request, InternalResponse response) t
                         }
                         response.setReadedLength(parser.getReadedLength());
                     }
+                }else{
+                    throw new HttpNetException(NetException.NetworkUnreachable);
                 }
             } else if (status.getStatusCode() <= 399) {
                 // redirect

litehttp/src/main/java/com/litesuits/http/LiteHttp.java

@@ -246,12 +246,12 @@ public <T> Response<T> execute(AbstractRequest<T> request) {
             if (HttpLog.isPrint) {
                 Thread t = Thread.currentThread();
                 HttpLog.i(TAG,
-                          "lite http request: " + request.createFullUri()
-                          + " , tag: " + request.getTag()
-                          + " , method: " + request.getMethod()
-                          + " , cache mode: " + request.getCacheMode()
-                          + " , thread ID: " + t.getId()
-                          + " , thread name: " + t.getName());
+                        "lite http request: " + request.createFullUri()
+                        + " , tag: " + request.getTag()
+                        + " , method: " + request.getMethod()
+                        + " , cache mode: " + request.getCacheMode()
+                        + " , thread ID: " + t.getId()
+                        + " , thread name: " + t.getName());
             }
             if (globalListener != null) {
                 globalListener.notifyCallStart(request);
@@ -447,10 +447,12 @@ public <T> void connectWithRetries(AbstractRequest<T> request, InternalResponse
                 }
                 // connect and parse data
                 config.httpClient.connect(request, response);
-            } catch (IOException e) {
-                cause = e;
+            } catch (HttpServerException | HttpNetException e) {
+                throw e;
             } catch (SecurityException e) {
                 throw new HttpClientException(e, ClientException.PermissionDenied);
+            } catch (IOException e) {
+                cause = e;
             } catch (Exception e) {
                 throw new HttpClientException(e);
             }

litehttp/src/main/java/com/litesuits/http/impl/huc/HttpUrlClient.java

@@ -7,10 +7,7 @@
 import com.litesuits.http.data.Consts;
 import com.litesuits.http.data.HttpStatus;
 import com.litesuits.http.data.NameValuePair;
-import com.litesuits.http.exception.HttpNetException;
-import com.litesuits.http.exception.HttpServerException;
-import com.litesuits.http.exception.NetException;
-import com.litesuits.http.exception.ServerException;
+import com.litesuits.http.exception.*;
 import com.litesuits.http.listener.StatisticsListener;
 import com.litesuits.http.log.HttpLog;
 import com.litesuits.http.parser.DataParser;
@@ -24,10 +21,7 @@
 import java.io.InputStream;
 import java.io.InterruptedIOException;
 import java.io.OutputStream;
-import java.net.HttpURLConnection;
-import java.net.SocketTimeoutException;
-import java.net.URI;
-import java.net.URL;
+import java.net.*;
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
 import java.util.ArrayList;
@@ -69,7 +63,7 @@ public void config(HttpConfig config) {
 
     @Override
     public <T> void connect(AbstractRequest<T> request, InternalResponse response)
-            throws Exception {
+            throws HttpClientException, IOException, URISyntaxException, HttpNetException, HttpServerException {
         InputStream inputStream = null;
         int maxRedirectTimes = request.getMaxRedirectTimes();
         StatisticsListener statistic = response.getStatistics();