Fix close connection

diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/BatchWsClient.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/BatchWsClient.java
index ea47cececbd372aaecfc24ad538a3224fdf88d4f..98269c46a6786490749835e171802713b61c7139 100644 (file)
--- a/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/BatchWsClient.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/BatchWsClient.java
@@ -97,7 +97,6 @@ public class BatchWsClient {
     }
     if (code == HTTP_FORBIDDEN || code == HTTP_BAD_REQUEST) {
       // SONAR-4397 Details are in response content
-      response.close();
       throw MessageException.of(tryParseAsJsonError(response.content()));
     }
     response.failIfNotSuccessful();

diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/client/OkHttpResponse.java b/sonar-ws/src/main/java/org/sonarqube/ws/client/OkHttpResponse.java
index ce412f69de82b50d287798d4a980640e75ea962a..0532e9f70f8bd08fc87f51c020db36aaa3aa0dd7 100644 (file)
--- a/sonar-ws/src/main/java/org/sonarqube/ws/client/OkHttpResponse.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/client/OkHttpResponse.java
@@ -20,6 +20,8 @@
 package org.sonarqube.ws.client;
 
 import okhttp3.Response;
+import okhttp3.ResponseBody;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Reader;
@@ -65,12 +67,18 @@ class OkHttpResponse extends BaseResponse {
     return okResponse.body().charStream();
   }
 
+  /**
+   * Get body content as a String. This response will be automatically closed.
+   */
   @Override
   public String content() {
+    ResponseBody body = okResponse.body();
     try {
-      return okResponse.body().string();
+      return body.string();
     } catch (IOException e) {
       throw fail(e);
+    } finally {
+      body.close();
     }
   }