Author: mduerig
Date: Mon Mar 2 10:32:46 2015
New Revision: 1663241
URL: http://svn.apache.org/r1663241
Log:
OAK-2558: Wrong interpretation of SegmentNodeStoreService configuration values
Correct interpretation of cache and size configuration values
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStoreService.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStoreService.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStoreService.java?rev=1663241&r1=1663240&r2=1663241&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStoreService.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStoreService.java
Mon Mar 2 10:32:46 2015
@@ -209,6 +209,11 @@ public class SegmentNodeStoreService ext
size = System.getProperty(SIZE, "256");
}
+ String cache = lookup(context, CACHE);
+ if (cache == null) {
+ cache = System.getProperty(CACHE);
+ }
+
boolean pauseCompaction = toBoolean(lookup(context, PAUSE_COMPACTION),
PAUSE_DEFAULT);
boolean cloneBinaries = toBoolean(
@@ -239,7 +244,8 @@ public class SegmentNodeStoreService ext
OsgiWhiteboard whiteboard = new
OsgiWhiteboard(context.getBundleContext());
Builder storeBuilder = FileStore.newFileStore(new File(directory))
- .withCacheSize(Integer.parseInt(size))
+ .withCacheSize(Integer.parseInt(cache))
+ .withMaxFileSize(Integer.parseInt(size))
.withMemoryMapping("64".equals(mode))
.withWhiteBoard(whiteboard);
if (customBlobStore) {
