Always close ResponseBody from okHttp

should fix hyperledger-web3j#710 by implementing square/okhttp#2311
antonydenyer · Jun 4, 2019 · 2064833 · 2064833
1 parent f99ceb1
commit 2064833
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/core/src/main/java/org/web3j/protocol/http/HttpService.java b/core/src/main/java/org/web3j/protocol/http/HttpService.java
@@ -150,17 +150,21 @@ protected InputStream performIO(String request) throws IOException {
 
         okhttp3.Response response = httpClient.newCall(httpRequest).execute();
         ResponseBody responseBody = response.body();
-        if (response.isSuccessful()) {
-            if (responseBody != null) {
-                return buildInputStream(responseBody);
+        try {
+            if (response.isSuccessful()) {
+                if (responseBody != null) {
+                    return buildInputStream(responseBody);
+                } else {
+                    return null;
+                }
             } else {
-                return null;
-            }
-        } else {
-            int code = response.code();
-            String text = responseBody == null ? "N/A" : responseBody.string();
+                int code = response.code();
+                String text = responseBody == null ? "N/A" : responseBody.string();
 
-            throw new ClientConnectionException("Invalid response received: " + code + "; " + text);
+                throw new ClientConnectionException("Invalid response received: " + code + "; " + text);
+            }
+        } finally {
+            responseBody.close();
         }
     }