jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alexparvule...@apache.org
Subject svn commit: r1438567 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/diffindex/BaseDiffCollector.java
Date Fri, 25 Jan 2013 15:59:24 GMT
Author: alexparvulescu
Date: Fri Jan 25 15:59:24 2013
New Revision: 1438567

URL: http://svn.apache.org/viewvc?rev=1438567&view=rev
Log:
OAK-343 Session.getNodeByUUID requires save call - fix the fix

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/diffindex/BaseDiffCollector.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/diffindex/BaseDiffCollector.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/diffindex/BaseDiffCollector.java?rev=1438567&r1=1438566&r2=1438567&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/diffindex/BaseDiffCollector.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/diffindex/BaseDiffCollector.java
Fri Jan 25 15:59:24 2013
@@ -21,6 +21,7 @@ import static org.apache.jackrabbit.oak.
 import java.util.HashSet;
 import java.util.Set;
 
+import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeState;
 import org.apache.jackrabbit.oak.spi.query.Filter;
 import org.apache.jackrabbit.oak.spi.state.EmptyNodeStateDiff;
 import org.apache.jackrabbit.oak.spi.state.NodeState;
@@ -122,18 +123,16 @@ public abstract class BaseDiffCollector 
 
         @Override
         public void childNodeAdded(String name, NodeState after) {
-            if (NodeStateUtils.isHidden(name) || isDone()) {
-                return;
-            }
-            testNodeState(after, name);
+            childNodeChanged(name, MemoryNodeState.EMPTY_NODE, after);
         }
 
         @Override
         public void childNodeChanged(String name, NodeState before,
                 NodeState after) {
-            if (isDone()) {
+            if (NodeStateUtils.isHidden(name) || isDone()) {
                 return;
             }
+            testNodeState(after, name);
             after.compareAgainstBaseState(before,
                     new DiffCollectorNodeStateDiff(collector, filter, this,
                             concat(path, name), results));



Mime
View raw message