Merge branch 'codezhang-dev' into 'master'

jianhui.zhang · jianhui.zhang · commit 5b021adfba6e · 2020-09-28T11:32:42.000+08:00
支持自定义HttpClient

See merge request esl_ipdd/ucloud-sdk-java!71
diff --git a/ucloud-sdk-java-common/src/main/java/cn/ucloud/common/http/Http.java b/ucloud-sdk-java-common/src/main/java/cn/ucloud/common/http/Http.java
@@ -117,17 +117,14 @@ public BaseResponseResult doHttp(HttpUriRequest request, UcloudHandler handler,
                     logger.error("response close error:{}", e.getMessage());
                 }
             }
-            try {
-                closeableHttpClient.close();
-            } catch (IOException e) {
-                if (enableLog) {
-                    logger.error("httpClient close error:{}", e.getMessage());
-                }
-            }
         }
         return responseResult;
     }
 
+    public static void closeHttpClient() throws IOException {
+        closeableHttpClient.close();
+    }
+
     private void handlerResult(UcloudHandler handler, BaseResponseResult result) {
         if (result.getRetCode() != 0) {
             handler.failed(result);

Original file line number	Diff line number	Diff line change
`@@ -117,17 +117,14 @@ public BaseResponseResult doHttp(HttpUriRequest request, UcloudHandler handler,`
`117`	`117`	`logger.error("response close error:{}", e.getMessage());`
`118`	`118`	`}`
`119`	`119`	`}`
`120`		`- try {`
`121`		`- closeableHttpClient.close();`
`122`		`- } catch (IOException e) {`
`123`		`- if (enableLog) {`
`124`		`- logger.error("httpClient close error:{}", e.getMessage());`
`125`		`- }`
`126`		`- }`
`127`	`120`	`}`
`128`	`121`	`return responseResult;`
`129`	`122`	`}`
`130`	`123`
	`124`	`+ public static void closeHttpClient() throws IOException {`
	`125`	`+ closeableHttpClient.close();`
	`126`	`+ }`
	`127`	`+`
`131`	`128`	`private void handlerResult(UcloudHandler handler, BaseResponseResult result) {`
`132`	`129`	`if (result.getRetCode() != 0) {`
`133`	`130`	`handler.failed(result);`