svn commit: r1788379 - in /jackrabbit/oak/branches/1.6: ./ oak-run/src/main/java/org/apache/jackrabbit/oak/run/SegmentTarUtils.java

[alexparvulescu]

Author: alexparvulescu
Date: Fri Mar 24 08:40:03 2017
New Revision: 1788379

URL: http://svn.apache.org/viewvc?rev=1788379&view=rev
Log:
OAK-5979 FileStore version check should disable memory mapping
 - merged r1788378


Modified:
    jackrabbit/oak/branches/1.6/   (props changed)
    
jackrabbit/oak/branches/1.6/oak-run/src/main/java/org/apache/jackrabbit/oak/run/SegmentTarUtils.java

Propchange: jackrabbit/oak/branches/1.6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 24 08:40:03 2017
@@ -1,3 +1,3 @@
 /jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782476,1782770,1782945,1782973,1782990,1783061,1783066,1783089,1783104-1783105,1783619,1783720,1783731,1783733,1783738,1783742,1783855,1783891,1784023,1784130,1784162,1784251,1784401,1784551,1784574,1785095,1785108,1785283,1785838,1785919,1787074,1787217
+/jackrabbit/oak/trunk:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782476,1782770,1782945,1782973,1782990,1783061,1783066,1783089,1783104-1783105,1783619,1783720,1783731,1783733,1783738,1783742,1783855,1783891,1784023,1784130,1784162,1784251,1784401,1784551,1784574,1785095,1785108,1785283,1785838,1785919,1787074,1787217,1788378
 /jackrabbit/trunk:1345480

Modified: 
jackrabbit/oak/branches/1.6/oak-run/src/main/java/org/apache/jackrabbit/oak/run/SegmentTarUtils.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-run/src/main/java/org/apache/jackrabbit/oak/run/SegmentTarUtils.java?rev=1788379&r1=1788378&r2=1788379&view=diff
==============================================================================
--- 
jackrabbit/oak/branches/1.6/oak-run/src/main/java/org/apache/jackrabbit/oak/run/SegmentTarUtils.java
 (original)
+++ 
jackrabbit/oak/branches/1.6/oak-run/src/main/java/org/apache/jackrabbit/oak/run/SegmentTarUtils.java
 Fri Mar 24 08:40:03 2017
@@ -239,10 +239,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();
     }
 
@@ -261,7 +262,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) {