Ensure all input streams are closed

uyuni-project · Oct 9, 2023 · 4fac60b · 4fac60b
1 parent 1ab2351
commit 4fac60b
Showing 1 changed file with 21 additions and 11 deletions.
diff --git a/java/code/src/com/redhat/rhn/manager/content/ubuntu/UbuntuErrataManager.java b/java/code/src/com/redhat/rhn/manager/content/ubuntu/UbuntuErrataManager.java
@@ -50,6 +50,8 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.io.Reader;
+import java.lang.reflect.Type;
 import java.net.URI;
 import java.nio.file.Files;
 import java.nio.file.Paths;
@@ -65,6 +67,8 @@
 
 public class UbuntuErrataManager {
 
+    private static final Type ERRATA_INFO_TYPE = new TypeToken<Map<String, UbuntuErrataInfo>>() { }.getType();
+
     private static final Logger LOG = LogManager.getLogger(UbuntuErrataManager.class);
 
     private UbuntuErrataManager() {
@@ -115,16 +119,19 @@ private static Map<String, UbuntuErrataInfo> downloadUbuntuErrataInfo(String jso
         HttpGet httpGet = new HttpGet(jsonDBUrl);
         LOG.info("download ubuntu errata start");
         HttpResponse httpResponse = httpClient.executeRequest(httpGet);
-        if (httpResponse.getStatusLine().getStatusCode() == HttpStatus.SC_OK) {
-            Map<String, UbuntuErrataInfo> errataInfo = GSON.fromJson(
-                    new InputStreamReader(httpResponse.getEntity().getContent()),
-                    new TypeToken<Map<String, UbuntuErrataInfo>>() { } .getType());
-            LOG.info("download ubuntu errata end");
-            return errataInfo;
+        int statusCode = httpResponse.getStatusLine().getStatusCode();
+        if (statusCode == HttpStatus.SC_OK) {
+            try (
+                InputStream responseStream = httpResponse.getEntity().getContent();
+                Reader responseReader = new InputStreamReader(responseStream);
+            ) {
+                Map<String, UbuntuErrataInfo> errataInfo = GSON.fromJson(responseReader, ERRATA_INFO_TYPE);
+                LOG.info("download ubuntu errata end");
+                return errataInfo;
+            }
         }
         else {
-            throw new IOException("error downloading " + jsonDBUrl + " status code " +
-                   httpResponse.getStatusLine().getStatusCode());
+            throw new IOException("error downloading " + jsonDBUrl + " status code " + statusCode);
         }
     }
 
@@ -178,9 +185,12 @@ private static Map<String, UbuntuErrataInfo> getUbuntuErrataInfo() throws IOExce
         String jsonDBUrl = "https://usn.ubuntu.com/usn-db/database.json";
         if (isFromDir()) {
             URI uri = MgrSyncUtils.urlToFSPath(jsonDBUrl, "");
-            InputStream inputStream = Files.newInputStream(Paths.get(uri));
-            return GSON.fromJson(new InputStreamReader(inputStream),
-                    new TypeToken<Map<String, UbuntuErrataInfo>>() { }.getType());
+            try (
+                InputStream inputStream = Files.newInputStream(Paths.get(uri));
+                Reader fileReader = new InputStreamReader(inputStream);
+            ) {
+                return GSON.fromJson(fileReader, ERRATA_INFO_TYPE);
+            }
         }
         else {
             return downloadUbuntuErrataInfo(jsonDBUrl);