Changeset 19372 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2025-04-02T17:09:56+02:00 (5 weeks ago)

Author:

stoecker

Message:

fix resource leaks for cached Zip files

File:

• trunk/src/org/openstreetmap/josm/io/CachedFile.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/io/CachedFile.java

@@ -316 +316 @@
      */
     public String findZipEntryPath(String extension, String namepart) {
-        Pair<String, InputStream> ze = findZipEntryImpl(extension, namepart);
+        Pair<String, Pair<ZipFile, InputStream>> ze = findZipEntryImpl(extension, namepart);
         if (ze == null) return null;
+        Utils.close(ze.b.b);
+        Utils.close(ze.b.a);
         return ze.a;
     }
@@ -328 +330 @@
      * doesn't represent a zip file or if there was no matching
      * file in the ZIP file.
-     * @since 6148
-     */
-    public InputStream findZipEntryInputStream(String extension, String namepart) {
-        Pair<String, InputStream> ze = findZipEntryImpl(extension, namepart);
+     * The returned ZipFile must be closed after use.
+     * @since 19372
+     */
+    public Pair<ZipFile, InputStream> findZipEntryInputStream(String extension, String namepart) {
+        Pair<String, Pair<ZipFile, InputStream>> ze = findZipEntryImpl(extension, namepart);
         if (ze == null) return null;
         return ze.b;
     }
 
-    private Pair<String, InputStream> findZipEntryImpl(String extension, String namepart) {
+    private Pair<String, Pair<ZipFile, InputStream>> findZipEntryImpl(String extension, String namepart) {
         File file = null;
         try {
@@ -345 +348 @@
         if (file == null)
             return null;
-        Pair<String, InputStream> res = null;
+        Pair<String, Pair <ZipFile, InputStream>> res = null;
         try {
-            ZipFile zipFile = new ZipFile(file, StandardCharsets.UTF_8); // NOPMD
+            ZipFile zipFile = new ZipFile(file, StandardCharsets.UTF_8);
             ZipEntry resentry = null;
             Enumeration<? extends ZipEntry> entries = zipFile.entries();
@@ -358 +361 @@
             }
             if (resentry != null) {
-                InputStream is = zipFile.getInputStream(resentry); // NOPMD
-                res = Pair.create(resentry.getName(), is);
+                InputStream is = zipFile.getInputStream(resentry);
+                res = Pair.create(resentry.getName(), Pair.create(zipFile, is));
             } else {
                 Utils.close(zipFile);