Changeset 8172 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2015-04-06T23:16:50+02:00 (9 years ago)

Author:

bastiK

Message:

see #11216 - fix IndexedDiskCacheManager (patch by wiktorn)

File:

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

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

@@ -15 +15 @@
 import org.apache.commons.jcs.auxiliary.disk.indexed.IndexedDiskCache;
 import org.apache.commons.jcs.auxiliary.disk.indexed.IndexedDiskCacheAttributes;
-import org.apache.commons.jcs.auxiliary.disk.indexed.IndexedDiskCacheManager;
+import org.apache.commons.jcs.auxiliary.disk.indexed.IndexedDiskCacheFactory;
 import org.apache.commons.jcs.engine.CompositeCacheAttributes;
 import org.apache.commons.jcs.engine.behavior.ICompositeCacheAttributes.DiskUsagePattern;
@@ -28 +28 @@
 /**
  * @author Wiktor Niesiobędzki
- * 
+ *
  * Wrapper class for JCS Cache. Sets some sane environment and returns instances of cache objects.
  * Static configuration for now assumes some small LRU cache in memory and larger LRU cache on disk
@@ -39 +39 @@
     private static long maxObjectTTL        = Long.MAX_VALUE;
     private final static String PREFERENCE_PREFIX = "jcs.cache";
+    private final static IndexedDiskCacheFactory diskCacheFactory = new IndexedDiskCacheFactory();
 
     /**
@@ -141 +142 @@
             IndexedDiskCacheAttributes diskAttributes = getDiskCacheAttributes(maxDiskObjects, cachePath);
             diskAttributes.setCacheName(cacheName);
-            IndexedDiskCache<K, V> diskCache = IndexedDiskCacheManager.getInstance(null, null, new StandardSerializer()).getCache(diskAttributes);
+            IndexedDiskCache<K, V> diskCache = diskCacheFactory.createCache(diskAttributes, cacheManager, null, new StandardSerializer());
+
             cc.setAuxCaches(new AuxiliaryCache[]{diskCache});
         }