Changeset 19462 in josm for trunk

Timestamp:

2026-01-14T21:41:37+01:00 (43 hours ago)

Author:

stoecker

Message:

should solve Coverity CID 147598 - resource leak

File:

• trunk/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java

@@ -51 +51 @@
 
     private static final AuxiliaryCacheFactory DISK_CACHE_FACTORY = getDiskCacheFactory();
+    private static FileChannel cacheDirChannel;
     private static FileLock cacheDirLock;
 
@@ -118 +119 @@
                         Logging.warn("Cannot create cache dir lock file");
                     }
-                    cacheDirLock = FileChannel.open(cacheDirLockPath.toPath(), StandardOpenOption.WRITE).tryLock();
+                    cacheDirChannel = FileChannel.open(cacheDirLockPath.toPath(), StandardOpenOption.WRITE);
+                    cacheDirLock = cacheDirChannel.tryLock();
 
                     if (cacheDirLock == null)
@@ -220 +222 @@
      */
     public static void shutdown() {
+        try {
+            if (cacheDirLock != null)
+                cacheDirLock.release();
+            if (cacheDirChannel != null)
+                cacheDirChannel.close();
+        } catch (IOException e) {
+            Logging.error(e);
+        }
         JCS.shutdown();
     }