Changeset 18770 in josm for trunk

Timestamp:

2023-06-23T15:01:21+02:00 (14 months ago)

Author:

taylor.smock

Message:

Fix a potential resource leak (CID-1349914)

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java

@@ -210 +210 @@
             return new ByteArrayInputStream(css.getBytes(StandardCharsets.UTF_8));
         }
-        CachedFile cf = getCachedFile();
-        if (isZip) {
-            File file = cf.getFile();
-            zipFile = new ZipFile(file, StandardCharsets.UTF_8);
-            zipIcons = file;
-            I18n.addTexts(zipIcons);
-            ZipEntry zipEntry = zipFile.getEntry(zipEntryPath);
-            return zipFile.getInputStream(zipEntry);
-        } else {
-            zipFile = null;
-            zipIcons = null;
-            return cf.getInputStream();
+        // This just closes any open http connections. It does not (with the current CachedFile implementation) close
+        // streams that it provides via getInputStream.
+        try (CachedFile cf = getCachedFile()) {
+            if (isZip) {
+                File file = cf.getFile();
+                zipFile = new ZipFile(file, StandardCharsets.UTF_8);
+                zipIcons = file;
+                I18n.addTexts(zipIcons);
+                ZipEntry zipEntry = zipFile.getEntry(zipEntryPath);
+                return zipFile.getInputStream(zipEntry);
+            } else {
+                zipFile = null;
+                zipIcons = null;
+                return cf.getInputStream();
+            }
         }
     }