You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by ch...@apache.org on 2014/09/09 13:42:25 UTC
svn commit: r1623768 -
/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/BlobStoreFixture.java
Author: chetanm
Date: Tue Sep 9 11:42:25 2014
New Revision: 1623768
URL: http://svn.apache.org/r1623768
Log:
OAK-2079 - Refactor BlobStore creation logic in a BlobStoreFixture
-- Use tmp directory in case basedir is not explicitly defined
-- FDS should only be used if none is explicitly defined
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/BlobStoreFixture.java
Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/BlobStoreFixture.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/BlobStoreFixture.java?rev=1623768&r1=1623767&r2=1623768&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/BlobStoreFixture.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/BlobStoreFixture.java Tue Sep 9 11:42:25 2014
@@ -72,12 +72,15 @@ public abstract class BlobStoreFixture i
if (className != null) {
return getDataStore();
}
+
+ if(basedir == null){
+ basedir = FileUtils.getTempDirectory();
+ }
+
String blobStore = System.getProperty("blobStoreType");
- if ("FDS".equals(blobStore) || fallbackToFDS) {
- checkNotNull(basedir, "Base directory must be specified for File based BlobStores");
+ if ("FDS".equals(blobStore) || (blobStore == null && fallbackToFDS)) {
return getFileDataStore(basedir, DataStoreBlobStore.DEFAULT_CACHE_SIZE);
} else if ("FBS".equals(blobStore)) {
- checkNotNull(basedir, "Base directory must be specified for File based BlobStores");
return getFileBlobStore(basedir);
} else if ("MEM".equals(blobStore)) {
return getMemoryBlobStore();