svn commit: r1830881 - /jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/InitialContentMigrator.java

[tomekr]

Author: tomekr
Date: Fri May  4 07:11:17 2018
New Revision: 1830881

URL: http://svn.apache.org/viewvc?rev=1830881&view=rev
Log:
OAK-7475: InitialContentMigrator logs the progress incorrectly

Modified:
    
jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/InitialContentMigrator.java

Modified: 
jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/InitialContentMigrator.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/InitialContentMigrator.java?rev=1830881&r1=1830880&r2=1830881&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/InitialContentMigrator.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/InitialContentMigrator.java
 Fri May  4 07:11:17 2018
@@ -194,17 +194,19 @@ public class InitialContentMigrator {
 
     private NodeState copyDiffToTarget(NodeState before, NodeState after, 
NodeState targetRoot) throws CommitFailedException {
         NodeBuilder targetBuilder = targetRoot.builder();
-        NodeState currentRoot = wrapNodeState(after);
-        NodeState baseRoot = wrapNodeState(before);
+        NodeState currentRoot = wrapNodeState(after, true);
+        NodeState baseRoot = wrapNodeState(before, false);
         currentRoot.compareAgainstBaseState(baseRoot, new 
ApplyDiff(targetBuilder));
         return targetNodeStore.merge(targetBuilder, EmptyHook.INSTANCE, 
CommitInfo.EMPTY);
     }
 
 
-    private NodeState wrapNodeState(NodeState nodeState) {
+    private NodeState wrapNodeState(NodeState nodeState, boolean logPaths) {
         NodeState wrapped = nodeState;
         wrapped = FilteringNodeState.wrap("/", wrapped, includePaths, 
excludePaths, fragmentPaths, excludeFragments);
-        wrapped = ReportingNodeState.wrap(wrapped, new LoggingReporter(LOG, 
"Copying", LOG_NODE_COPY, -1));
+        if (logPaths) {
+            wrapped = ReportingNodeState.wrap(wrapped, new 
LoggingReporter(LOG, "Copying", LOG_NODE_COPY, -1));
+        }
         return wrapped;
     }