Author: thomasm Date: Fri Aug 7 09:42:54 2015 New Revision: 1694639 URL: http://svn.apache.org/r1694639 Log: OAK-3158 IAE when specifiying 2G cache for FileStore
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentTracker.java Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentTracker.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentTracker.java?rev=1694639&r1=1694638&r2=1694639&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentTracker.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentTracker.java Fri Aug 7 09:42:54 2015 @@ -65,7 +65,7 @@ public class SegmentTracker { private static final long BULK = 0xBL << 60; - private static final int MB = 1024 * 1024; + private static final long MB = 1024 * 1024; private static final int DEFAULT_MEMORY_CACHE_SIZE = 256; @@ -120,12 +120,12 @@ public class SegmentTracker { if (DISABLE_STRING_CACHE) { c = null; } else { - int stringCacheSize = (int) Math.min(Integer.MAX_VALUE, (long) (cacheSizeMB * MB)); + int stringCacheSize = (int) Math.min(Integer.MAX_VALUE, cacheSizeMB * MB); c = new StringCache(stringCacheSize); } stringCache = c; segmentCache = CacheLIRS.<SegmentId, Segment>newBuilder() - .maximumSize((int) Math.min(Integer.MAX_VALUE, (long) (cacheSizeMB * MB))) + .maximumSize((int) Math.min(Integer.MAX_VALUE, cacheSizeMB * MB)) .averageWeight(Segment.MAX_SEGMENT_SIZE/2) .evictionCallback(new EvictionCallback<SegmentId, Segment>() { @Override