Changeset 13643 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2018-04-16T23:00:30+02:00 (6 years ago)

Author:

wiktorn

Message:

In case of any IOExceptions when creating disk cache return memory-only cache

Closes: #16193

Location:

trunk/src/org/openstreetmap/josm/gui/layer

Files:

• AbstractCachedTileSourceLayer.java (modified) (4 diffs)
• geoimage/ThumbsLoader.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/layer/AbstractCachedTileSourceLayer.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.layer;
 
-import java.io.IOException;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -16 +15 @@
 import org.openstreetmap.josm.data.imagery.TileLoaderFactory;
 import org.openstreetmap.josm.data.preferences.IntegerProperty;
-import org.openstreetmap.josm.tools.Logging;
 
 /**
@@ -84 +82 @@
             return cache;
         }
-        try {
-            cache = JCSCacheManager.getCache(getCacheName(),
-                    0,
-                    getDiskCacheSize(),
-                    CachedTileLoaderFactory.PROP_TILECACHE_DIR.get());
-            return cache;
-        } catch (IOException e) {
-            Logging.warn(e);
-            return null;
-        }
+        cache = JCSCacheManager.getCache(getCacheName(),
+                0,
+                getDiskCacheSize(),
+                CachedTileLoaderFactory.PROP_TILECACHE_DIR.get());
+        return cache;
     }
 
@@ -125 +118 @@
      */
     public static CacheAccess<String, BufferedImageCacheEntry> getCache(String name) {
-            try {
-                return JCSCacheManager.getCache(name,
-                        0,
-                        MAX_DISK_CACHE_SIZE.get() * 1024, // MAX_DISK_CACHE_SIZE is in MB, needs to by in sync with getDiskCacheSize
-                        CachedTileLoaderFactory.PROP_TILECACHE_DIR.get());
-            } catch (IOException e) {
-                Logging.warn(e);
-                return null;
-            }
+            return JCSCacheManager.getCache(name,
+                    0,
+                    MAX_DISK_CACHE_SIZE.get() * 1024, // MAX_DISK_CACHE_SIZE is in MB, needs to by in sync with getDiskCacheSize
+                    CachedTileLoaderFactory.PROP_TILECACHE_DIR.get());
     }
 

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java

@@ -68 +68 @@
     private void initCache() {
         if (!cacheOff) {
-            try {
-                cache = JCSCacheManager.getCache("geoimage-thumbnails", 0, 120,
-                        Config.getDirs().getCacheDirectory(true).getPath() + File.separator + "geoimage-thumbnails");
-            } catch (IOException e) {
-                Logging.warn("Failed to initialize cache for geoimage-thumbnails");
-                Logging.warn(e);
-            }
+            cache = JCSCacheManager.getCache("geoimage-thumbnails", 0, 120,
+                    Config.getDirs().getCacheDirectory(true).getPath() + File.separator + "geoimage-thumbnails");
         }
     }