jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mreut...@apache.org
Subject svn commit: r1436615 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionHook.java
Date Mon, 21 Jan 2013 20:52:07 GMT
Author: mreutegg
Date: Mon Jan 21 20:52:06 2013
New Revision: 1436615

URL: http://svn.apache.org/viewvc?rev=1436615&view=rev
Log:
OAK-574: Ignore hidden NodeStates in VersionHook

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionHook.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionHook.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionHook.java?rev=1436615&r1=1436614&r2=1436615&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionHook.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/version/VersionHook.java
Mon Jan 21 20:52:06 2013
@@ -36,6 +36,7 @@ import org.apache.jackrabbit.oak.spi.com
 import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
 import org.apache.jackrabbit.oak.spi.state.NodeState;
 import org.apache.jackrabbit.oak.spi.state.NodeStateDiff;
+import org.apache.jackrabbit.oak.spi.state.NodeStateUtils;
 import org.apache.jackrabbit.oak.version.VersionConstants;
 
 import static com.google.common.base.Preconditions.checkNotNull;
@@ -142,12 +143,18 @@ public class VersionHook implements Comm
         public void childNodeChanged(String name,
                                      NodeState before,
                                      NodeState after) {
+            if (NodeStateUtils.isHidden(name)) {
+                return;
+            }
             after.compareAgainstBaseState(before,
                     new VersionDiff(this, vMgr, nodeAfter.child(name)));
         }
 
         @Override
         public void childNodeDeleted(String name, NodeState before) {
+            if (NodeStateUtils.isHidden(name)) {
+                return;
+            }
             NodeState after = MemoryNodeState.EMPTY_NODE;
             after.compareAgainstBaseState(before,
                     new VersionDiff(this, vMgr, after.builder()));



Mime
View raw message