#165 #167

chanjarster · Jul 13, 2015 · d3d61d7 · d3d61d7
1 parent 4bee1ba
commit d3d61d7
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 47 deletions.
diff --git a/...common/src/main/java/me/chanjar/weixin/common/util/http/MediaDownloadRequestExecutor.java b/...common/src/main/java/me/chanjar/weixin/common/util/http/MediaDownloadRequestExecutor.java
@@ -53,19 +53,17 @@ public File execute(CloseableHttpClient httpclient, HttpHost httpProxy, String u
       httpGet.setConfig(config);
     }
 
-    CloseableHttpResponse response = httpclient.execute(httpGet);
+    try (CloseableHttpResponse response = httpclient.execute(httpGet)) {
 
-    Header[] contentTypeHeader = response.getHeaders("Content-Type");
-    if (contentTypeHeader != null && contentTypeHeader.length > 0) {
-      // 下载媒体文件出错
-      if (ContentType.TEXT_PLAIN.getMimeType().equals(contentTypeHeader[0].getValue())) {
-        String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response);
-        throw new WxErrorException(WxError.fromJson(responseContent));
+      Header[] contentTypeHeader = response.getHeaders("Content-Type");
+      if (contentTypeHeader != null && contentTypeHeader.length > 0) {
+        // 下载媒体文件出错
+        if (ContentType.TEXT_PLAIN.getMimeType().equals(contentTypeHeader[0].getValue())) {
+          String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response);
+          throw new WxErrorException(WxError.fromJson(responseContent));
+        }
       }
-    }
-    InputStream inputStream = null;
-    try {
-      inputStream = InputStreamResponseHandler.INSTANCE.handleResponse(response);
+      InputStream inputStream = InputStreamResponseHandler.INSTANCE.handleResponse(response);
 
       // 视频文件不支持下载
       String fileName = getFileName(response);
@@ -75,11 +73,9 @@ public File execute(CloseableHttpClient httpclient, HttpHost httpProxy, String u
       String[] name_ext = fileName.split("\\.");
       File localFile = FileUtils.createTmpFile(inputStream, name_ext[0], name_ext[1], tmpDirFile);
       return localFile;
-    } finally {
-      if (inputStream != null) {
-        inputStream.close();
-      }
+
     }
+
   }
 
   protected String getFileName(CloseableHttpResponse response) {

diff --git a/...a-common/src/main/java/me/chanjar/weixin/common/util/http/MediaUploadRequestExecutor.java b/...a-common/src/main/java/me/chanjar/weixin/common/util/http/MediaUploadRequestExecutor.java
@@ -39,13 +39,14 @@ public WxMediaUploadResult execute(CloseableHttpClient httpclient, HttpHost http
       httpPost.setEntity(entity);
       httpPost.setHeader("Content-Type", ContentType.MULTIPART_FORM_DATA.toString());
     }
-    CloseableHttpResponse response = httpclient.execute(httpPost);
-    String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response);
-    WxError error = WxError.fromJson(responseContent);
-    if (error.getErrorCode() != 0) {
-      throw new WxErrorException(error);
+    try (CloseableHttpResponse response = httpclient.execute(httpPost)) {
+      String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response);
+      WxError error = WxError.fromJson(responseContent);
+      if (error.getErrorCode() != 0) {
+        throw new WxErrorException(error);
+      }
+      return WxMediaUploadResult.fromJson(responseContent);
     }
-    return WxMediaUploadResult.fromJson(responseContent);
   }
 
 }
diff --git a/...ava-common/src/main/java/me/chanjar/weixin/common/util/http/SimpleGetRequestExecutor.java b/...ava-common/src/main/java/me/chanjar/weixin/common/util/http/SimpleGetRequestExecutor.java
@@ -33,13 +33,14 @@ public String execute(CloseableHttpClient httpclient, HttpHost httpProxy, String
       httpGet.setConfig(config);
     }
 
-    CloseableHttpResponse response = httpclient.execute(httpGet);
-    String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response);
-    WxError error = WxError.fromJson(responseContent);
-    if (error.getErrorCode() != 0) {
-      throw new WxErrorException(error);
+    try (CloseableHttpResponse response = httpclient.execute(httpGet)) {
+      String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response);
+      WxError error = WxError.fromJson(responseContent);
+      if (error.getErrorCode() != 0) {
+        throw new WxErrorException(error);
+      }
+      return responseContent;
     }
-    return responseContent;
   }
 
 }
diff --git a/...va-common/src/main/java/me/chanjar/weixin/common/util/http/SimplePostRequestExecutor.java b/...va-common/src/main/java/me/chanjar/weixin/common/util/http/SimplePostRequestExecutor.java
@@ -40,13 +40,14 @@ public String execute(CloseableHttpClient httpclient, HttpHost httpProxy, String
       httpPost.setEntity(entity);
     }
 
-    CloseableHttpResponse response = httpclient.execute(httpPost);
-    String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response);
-    WxError error = WxError.fromJson(responseContent);
-    if (error.getErrorCode() != 0) {
-      throw new WxErrorException(error);
+    try (CloseableHttpResponse response = httpclient.execute(httpPost)) {
+      String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response);
+      WxError error = WxError.fromJson(responseContent);
+      if (error.getErrorCode() != 0) {
+        throw new WxErrorException(error);
+      }
+      return responseContent;
     }
-    return responseContent;
   }
 
 }
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpServiceImpl.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpServiceImpl.java
@@ -117,8 +117,10 @@ public String getAccessToken(boolean forceRefresh) throws WxErrorException {
               httpGet.setConfig(config);
             }
             CloseableHttpClient httpclient = getHttpclient();
-            CloseableHttpResponse response = httpclient.execute(httpGet);
-            String resultContent = new BasicResponseHandler().handleResponse(response);
+            String resultContent = null;
+            try (CloseableHttpResponse response = httpclient.execute(httpGet)) {
+              resultContent = new BasicResponseHandler().handleResponse(response);
+            }
             WxError error = WxError.fromJson(resultContent);
             if (error.getErrorCode() != 0) {
               throw new WxErrorException(error);

diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/QrCodeRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/QrCodeRequestExecutor.java
@@ -47,20 +47,21 @@ public File execute(CloseableHttpClient httpclient, HttpHost httpProxy, String u
       httpGet.setConfig(config);
     }
 
-    CloseableHttpResponse response = httpclient.execute(httpGet);
-
-    Header[] contentTypeHeader = response.getHeaders("Content-Type");
-    if (contentTypeHeader != null && contentTypeHeader.length > 0) {
-      // 出错
-      if (ContentType.TEXT_PLAIN.getMimeType().equals(contentTypeHeader[0].getValue())) {
-        String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response);
-        throw new WxErrorException(WxError.fromJson(responseContent));
+    try (CloseableHttpResponse response = httpclient.execute(httpGet)) {
+      Header[] contentTypeHeader = response.getHeaders("Content-Type");
+      if (contentTypeHeader != null && contentTypeHeader.length > 0) {
+        // 出错
+        if (ContentType.TEXT_PLAIN.getMimeType().equals(contentTypeHeader[0].getValue())) {
+          String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response);
+          throw new WxErrorException(WxError.fromJson(responseContent));
+        }
       }
+      InputStream inputStream = InputStreamResponseHandler.INSTANCE.handleResponse(response);
+
+      File localFile = FileUtils.createTmpFile(inputStream, UUID.randomUUID().toString(), "jpg");
+      return localFile;
     }
-    InputStream inputStream = InputStreamResponseHandler.INSTANCE.handleResponse(response);
-
-    File localFile = FileUtils.createTmpFile(inputStream, UUID.randomUUID().toString(), "jpg");
-    return localFile;
+
   }
 
 }