svn commit: r1788378 - /jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/SegmentTarUtils.java

[alexparvulescu]

Author: alexparvulescu
Date: Fri Mar 24 08:38:07 2017
New Revision: 1788378

URL: http://svn.apache.org/viewvc?rev=1788378&view=rev
Log:
OAK-5979 FileStore version check should disable memory mapping
 - fix for segment-tar first


Modified:
    
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/SegmentTarUtils.java

Modified: 
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/SegmentTarUtils.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/SegmentTarUtils.java?rev=1788378&r1=1788377&r2=1788378&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/SegmentTarUtils.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/SegmentTarUtils.java
 Fri Mar 24 08:38:07 2017
@@ -246,10 +246,11 @@ final class SegmentTarUtils {
         return fileStoreBuilder(new File(path)).build();
     }
 
-    private static ReadOnlyFileStore openReadOnlyFileStore(File path) throws 
IOException, InvalidFileStoreVersionException {
+    private static ReadOnlyFileStore openReadOnlyFileStore(File path, boolean 
memoryMapped)
+            throws IOException, InvalidFileStoreVersionException {
         return fileStoreBuilder(isValidFileStoreOrFail(path))
                 .withSegmentCacheSize(TAR_SEGMENT_CACHE_SIZE)
-                .withMemoryMapping(TAR_STORAGE_MEMORY_MAPPED)
+                .withMemoryMapping(memoryMapped)
                 .buildReadOnly();
     }
 
@@ -268,7 +269,7 @@ final class SegmentTarUtils {
         if (!directory.exists()) {
             return directory;
         }
-        ReadOnlyFileStore store = openReadOnlyFileStore(directory);
+        ReadOnlyFileStore store = openReadOnlyFileStore(directory, false);
         try {
             SegmentVersion segmentVersion = getSegmentVersion(store);
             if (segmentVersion != LATEST_VERSION) {