svn commit: r1771084 - /jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java

[tomekr]

Author: tomekr
Date: Thu Nov 24 08:49:30 2016
New Revision: 1771084

URL: http://svn.apache.org/viewvc?rev=1771084&view=rev
Log:
OAK-5154: Checkpoints should only be migrated if no custom paths are defined

Modified:
    
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java

Modified: 
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java?rev=1771084&r1=1771083&r2=1771084&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegrade.java
 Thu Nov 24 08:49:30 2016
@@ -29,7 +29,6 @@ import javax.jcr.RepositoryException;
 import com.google.common.base.Function;
 import org.apache.commons.lang.StringUtils;
 import org.apache.jackrabbit.oak.api.CommitFailedException;
-import org.apache.jackrabbit.oak.plugins.version.ReadWriteVersionManager;
 import org.apache.jackrabbit.oak.spi.commit.CommitHook;
 import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
 import org.apache.jackrabbit.oak.spi.commit.CompositeEditorProvider;
@@ -300,12 +299,15 @@ public class RepositorySidegrade {
         }
 
         boolean isRemoveCheckpointReferences = false;
-        if (!copyCheckpoints(targetRoot)) {
-            LOG.info("Copying checkpoints is not supported for this 
combination of node stores");
-            isRemoveCheckpointReferences = true;
-        }
-        if (!DEFAULT_INCLUDE_PATHS.equals(includePaths)) {
+        if (!isCompleteMigration()) {
+            LOG.info("Custom paths have been specified, checkpoints won't be 
migrated");
             isRemoveCheckpointReferences = true;
+        } else {
+            boolean checkpointsCopied = copyCheckpoints(targetRoot);
+            if (!checkpointsCopied) {
+                LOG.info("Copying checkpoints is not supported for this 
combination of node stores");
+                isRemoveCheckpointReferences = true;
+            }
         }
         if (isRemoveCheckpointReferences) {
             removeCheckpointReferences(targetRoot);