Fix OkHttp connection leaks on connection error

When request fails, entire response needs to be wrapped in try with
resources in order to close the connection properly and not only
response body.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
This commit is contained in:
Tomas Slusny
2017-12-22 02:05:28 +01:00
parent a6fde8fb28
commit 4660bb3739
9 changed files with 77 additions and 104 deletions

View File

@@ -31,13 +31,11 @@ import java.util.HashMap;
import java.util.Map;
import net.runelite.http.api.RuneliteAPI;
import okhttp3.HttpUrl;
import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.Response;
public class ConfigLoader
{
private static final OkHttpClient CLIENT = RuneliteAPI.CLIENT;
private static final HttpUrl CONFIG_URL = HttpUrl.parse("http://oldschool.runescape.com/jav_config.ws"); // https redirects us to rs3
public static final String CODEBASE = "codebase";
@@ -53,7 +51,7 @@ public class ConfigLoader
.url(CONFIG_URL)
.build();
try (Response response = CLIENT.newCall(request).execute();
try (Response response = RuneliteAPI.CLIENT.newCall(request).execute();
BufferedReader in = new BufferedReader(new InputStreamReader(response.body().byteStream())))
{
String str;