Changeset 9142 in josm for trunk/src/org


Ignore:
Timestamp:
2015-12-23T23:39:12+01:00 (4 years ago)
Author:
wiktorn
Message:

Revert [9064]. Move back to IndexedDiskCache

Closes: #12221, reopens: #11566

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java

    r9070 r9142  
    1717import org.apache.commons.jcs.auxiliary.AuxiliaryCacheFactory;
    1818import org.apache.commons.jcs.auxiliary.disk.behavior.IDiskCacheAttributes;
    19 import org.apache.commons.jcs.auxiliary.disk.block.BlockDiskCacheAttributes;
    20 import org.apache.commons.jcs.auxiliary.disk.block.BlockDiskCacheFactory;
     19import org.apache.commons.jcs.auxiliary.disk.indexed.IndexedDiskCacheAttributes;
     20import org.apache.commons.jcs.auxiliary.disk.indexed.IndexedDiskCacheFactory;
    2121import org.apache.commons.jcs.engine.CompositeCacheAttributes;
    2222import org.apache.commons.jcs.engine.behavior.ICompositeCacheAttributes.DiskUsagePattern;
     
    4141    private static long maxObjectTTL        = -1;
    4242    private static final String PREFERENCE_PREFIX = "jcs.cache";
    43     private static final AuxiliaryCacheFactory diskCacheFactory = new BlockDiskCacheFactory();
     43    private static final AuxiliaryCacheFactory diskCacheFactory = new IndexedDiskCacheFactory();
    4444    private static FileLock cacheDirLock;
    4545
     
    184184
    185185    private static IDiskCacheAttributes getDiskCacheAttributes(int maxDiskObjects, String cachePath) {
    186         BlockDiskCacheAttributes ret = new BlockDiskCacheAttributes();
     186        IndexedDiskCacheAttributes ret = new IndexedDiskCacheAttributes();
    187187        ret.setDiskLimitType(IDiskCacheAttributes.DiskLimitType.SIZE);
    188188        ret.setMaxKeySize(maxDiskObjects);
Note: See TracChangeset for help on using the changeset viewer.