Ticket #11216: fix_IndexedDiskCacheManager.patch

build.xml

@@ -434 +434 @@
         -keep class * extends org.openstreetmap.josm.io.FileExporter
         -keep class org.w3._2001.xmlschema.Adapter1
         -keep class org.openstreetmap.josm.actions.search.SearchCompiler$Never
+        -keep class org.apache.commons.logging.impl.*
 
         -keepclassmembers enum  * {
             public static **[] values();

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

@@ -14 +14 @@
 import org.apache.commons.jcs.auxiliary.AuxiliaryCache;
 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;
 import org.apache.commons.jcs.engine.control.CompositeCache;
@@ -27 +27 @@
 
 /**
  * @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
  *
@@ -38 +38 @@
     private static volatile CompositeCacheManager cacheManager = null;
     private static long maxObjectTTL        = Long.MAX_VALUE;
     private final static String PREFERENCE_PREFIX = "jcs.cache";
+    private final static IndexedDiskCacheFactory diskCacheFactory = new IndexedDiskCacheFactory();
 
     /**
      * default objects to be held in memory by JCS caches (per region)
@@ -140 +141 @@
         if (cachePath != null) {
             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});
         }
         return new CacheAccess<K, V>(cc);