Changeset 9142 in josm for trunk/src

Timestamp:

2015-12-23T23:39:12+01:00 (9 years ago)

Author:

wiktorn

Message:

Revert [9064]. Move back to IndexedDiskCache

Closes: #12221, reopens: #11566

File:

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

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

@@ -17 +17 @@
 import org.apache.commons.jcs.auxiliary.AuxiliaryCacheFactory;
 import org.apache.commons.jcs.auxiliary.disk.behavior.IDiskCacheAttributes;
-import org.apache.commons.jcs.auxiliary.disk.block.BlockDiskCacheAttributes;
-import org.apache.commons.jcs.auxiliary.disk.block.BlockDiskCacheFactory;
+import org.apache.commons.jcs.auxiliary.disk.indexed.IndexedDiskCacheAttributes;
+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;
@@ -41 +41 @@
     private static long maxObjectTTL        = -1;
     private static final String PREFERENCE_PREFIX = "jcs.cache";
-    private static final AuxiliaryCacheFactory diskCacheFactory = new BlockDiskCacheFactory();
+    private static final AuxiliaryCacheFactory diskCacheFactory = new IndexedDiskCacheFactory();
     private static FileLock cacheDirLock;
 
@@ -184 +184 @@
 
     private static IDiskCacheAttributes getDiskCacheAttributes(int maxDiskObjects, String cachePath) {
-        BlockDiskCacheAttributes ret = new BlockDiskCacheAttributes();
+        IndexedDiskCacheAttributes ret = new IndexedDiskCacheAttributes();
         ret.setDiskLimitType(IDiskCacheAttributes.DiskLimitType.SIZE);
         ret.setMaxKeySize(maxDiskObjects);