Author: mreutegg
Date: Wed May 11 14:14:34 2016
New Revision: 1743375
URL: http://svn.apache.org/viewvc?rev=1743375&view=rev
Log:
OAK-3840: Clean up the FileStore constructor
Only set blobStore when not null
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/OakFixture.java
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/OakFixture.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/OakFixture.java?rev=1743375&r1=1743374&r2=1743375&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/OakFixture.java
(original)
+++
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/OakFixture.java
Wed May 11 14:14:34 2016
@@ -368,9 +368,11 @@ public abstract class OakFixture {
blobStore = blobStoreFixtures[i].setUp();
}
- stores[i] = FileStore.builder(new File(base, unique))
- .withBlobStore(blobStore)
- .withRoot(EmptyNodeState.EMPTY_NODE)
+ FileStore.Builder builder = FileStore.builder(new File(base,
unique));
+ if (blobStore != null) {
+ builder.withBlobStore(blobStore);
+ }
+ stores[i] = builder.withRoot(EmptyNodeState.EMPTY_NODE)
.withMaxFileSize(maxFileSizeMB)
.withCacheSize(cacheSizeMB)
.withMemoryMapping(memoryMapping)
