SCANNERAPI-189 Fix memory leaks

damien-urruty-sonarsource · damien-urruty-sonarsource · commit e3d6a8eedc55 · 2020-12-03T21:08:59.000+01:00
diff --git a/api/src/main/java/org/sonarsource/scanner/api/internal/ServerConnection.java b/api/src/main/java/org/sonarsource/scanner/api/internal/ServerConnection.java
@@ -96,8 +96,9 @@ public String downloadString(String urlPath) throws IOException {
     }
     String url = baseUrlWithoutTrailingSlash + urlPath;
     logger.debug(format("Download: %s", url));
-    ResponseBody responseBody = callUrl(url);
-    return responseBody.string();
+    try (ResponseBody responseBody = callUrl(url)) {
+      return responseBody.string();
+    }
   }
 
   /**
@@ -113,6 +114,7 @@ private ResponseBody callUrl(String url) throws IOException {
         .build();
       Response response = httpClient.newCall(request).execute();
       if (!response.isSuccessful()) {
+        response.close();
         throw new IllegalStateException(format("Status returned by url [%s] is not valid: [%s]", response.request().url(), response.code()));
       }
       return response.body();

Original file line number	Diff line number	Diff line change
`@@ -96,8 +96,9 @@ public String downloadString(String urlPath) throws IOException {`
`96`	`96`	`}`
`97`	`97`	`String url = baseUrlWithoutTrailingSlash + urlPath;`
`98`	`98`	`logger.debug(format("Download: %s", url));`
`99`		`- ResponseBody responseBody = callUrl(url);`
`100`		`- return responseBody.string();`
	`99`	`+ try (ResponseBody responseBody = callUrl(url)) {`
	`100`	`+ return responseBody.string();`
	`101`	`+ }`
`101`	`102`	`}`
`102`	`103`
`103`	`104`	`/**`
`@@ -113,6 +114,7 @@ private ResponseBody callUrl(String url) throws IOException {`
`113`	`114`	`.build();`
`114`	`115`	`Response response = httpClient.newCall(request).execute();`
`115`	`116`	`if (!response.isSuccessful()) {`
	`117`	`+ response.close();`
`116`	`118`	`throw new IllegalStateException(format("Status returned by url [%s] is not valid: [%s]", response.request().url(), response.code()));`
`117`	`119`	`}`
`118`	`120`	`return response.body();`