svn commit: r1788382 - /jackrabbit/oak/branches/1.6/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/segment/FileStoreHelper.java

[alexparvulescu]

Author: alexparvulescu
Date: Fri Mar 24 09:06:45 2017
New Revision: 1788382

URL: http://svn.apache.org/viewvc?rev=1788382&view=rev
Log:
OAK-5982 SegmentMk version check with disabled mmaping


Modified:
    
jackrabbit/oak/branches/1.6/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/segment/FileStoreHelper.java

Modified: 
jackrabbit/oak/branches/1.6/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/segment/FileStoreHelper.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/segment/FileStoreHelper.java?rev=1788382&r1=1788381&r2=1788382&view=diff
==============================================================================
--- 
jackrabbit/oak/branches/1.6/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/segment/FileStoreHelper.java
 (original)
+++ 
jackrabbit/oak/branches/1.6/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/segment/FileStoreHelper.java
 Fri Mar 24 09:06:45 2017
@@ -179,7 +179,7 @@ public final class FileStoreHelper {
         if (!directory.exists()) {
             return directory;
         }
-        FileStore store = openReadOnlyFileStore(directory);
+        FileStore store = openReadOnlyFileStore(directory, false);
         try {
             SegmentVersion segmentVersion = getSegmentVersion(store);
             if (segmentVersion != LATEST_VERSION) {
@@ -222,9 +222,14 @@ public final class FileStoreHelper {
 
     public static ReadOnlyStore openReadOnlyFileStore(File directory)
             throws IOException, InvalidFileStoreVersionException {
+        return openReadOnlyFileStore(directory, TAR_STORAGE_MEMORY_MAPPED);
+    }
+
+    public static ReadOnlyStore openReadOnlyFileStore(File directory, boolean 
memoryMapped)
+            throws IOException, InvalidFileStoreVersionException {
         return FileStore.builder(isValidFileStoreOrFail(directory))
                 .withCacheSize(TAR_SEGMENT_CACHE_SIZE)
-                .withMemoryMapping(TAR_STORAGE_MEMORY_MAPPED)
+                .withMemoryMapping(memoryMapped)
                 .buildReadOnly();
     }