Changeset 13649 in josm for trunk/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java

Timestamp:

2018-04-19T22:34:52+02:00 (7 years ago)

Author:

Don-vip

Message:

fix #16204 - allow to create a new layer, draw, drag, open a few windows. Nothing more to hope in sandbox mode. At least JOSM is now more robust than ever.

File:

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

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

@@ -108 +108 @@
         File cacheDir = new File(Config.getDirs().getCacheDirectory(true), "jcs");
 
-        if (!cacheDir.exists() && !cacheDir.mkdirs()) {
-            Logging.warn("Cache directory " + cacheDir.toString() + " does not exists and could not create it");
-        } else {
-            File cacheDirLockPath = new File(cacheDir, ".lock");
-            try {
-                if (!cacheDirLockPath.exists() && !cacheDirLockPath.createNewFile()) {
-                    Logging.warn("Cannot create cache dir lock file");
-                }
-                cacheDirLock = FileChannel.open(cacheDirLockPath.toPath(), StandardOpenOption.WRITE).tryLock();
-
-                if (cacheDirLock == null)
-                    Logging.warn("Cannot lock cache directory. Will not use disk cache");
-            } catch (IOException e) {
-                Logging.warn("Cannot create cache dir \"" + cacheDirLockPath.toString() + "\" lock file: " + e.toString());
-                Logging.warn("Will not use disk cache");
+        try {
+            if (!cacheDir.exists() && !cacheDir.mkdirs()) {
+                Logging.warn("Cache directory " + cacheDir.toString() + " does not exists and could not create it");
+            } else {
+                File cacheDirLockPath = new File(cacheDir, ".lock");
+                try {
+                    if (!cacheDirLockPath.exists() && !cacheDirLockPath.createNewFile()) {
+                        Logging.warn("Cannot create cache dir lock file");
+                    }
+                    cacheDirLock = FileChannel.open(cacheDirLockPath.toPath(), StandardOpenOption.WRITE).tryLock();
+
+                    if (cacheDirLock == null)
+                        Logging.warn("Cannot lock cache directory. Will not use disk cache");
+                } catch (IOException e) {
+                    Logging.warn("Cannot create cache dir \"" + cacheDirLockPath.toString() + "\" lock file: " + e.toString());
+                    Logging.warn("Will not use disk cache");
+                }
             }
-        }
+        } catch (SecurityException e) {
+            Logging.log(Logging.LEVEL_WARN, "Unable to configure disk cache. Will not use it", e);
+        }
+
         // this could be moved to external file
         Properties props = new Properties();
@@ -140 +145 @@
         props.setProperty("jcs.default.elementattributes.IsSpool",            "true");
         // CHECKSTYLE.ON: SingleSpaceSeparator
-        CompositeCacheManager cm = CompositeCacheManager.getUnconfiguredInstance();
-        cm.configure(props);
-        cacheManager = cm;
+        try {
+            CompositeCacheManager cm = CompositeCacheManager.getUnconfiguredInstance();
+            cm.configure(props);
+            cacheManager = cm;
+        } catch (SecurityException e) {
+            Logging.log(Logging.LEVEL_WARN, "Unable to initialize JCS", e);
+        }
     }
 
@@ -173 +182 @@
             if (cacheManager == null)
                 initialize();
-            return getCacheInner(cacheName, maxMemoryObjects, maxDiskObjects, cachePath);
+            return cacheManager != null ? getCacheInner(cacheName, maxMemoryObjects, maxDiskObjects, cachePath) : null;
         }
     }