You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by md...@apache.org on 2012/06/28 18:23:23 UTC
svn commit: r1355065 - in /jackrabbit/oak/trunk/oak-jcr: pom.xml
src/main/java/org/apache/jackrabbit/oak/jcr/observation/ChangeFilter.java
Author: mduerig
Date: Thu Jun 28 16:23:22 2012
New Revision: 1355065
URL: http://svn.apache.org/viewvc?rev=1355065&view=rev
Log:
OAK-144: Implement observation
fix filter for deep items
Modified:
jackrabbit/oak/trunk/oak-jcr/pom.xml
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ChangeFilter.java
Modified: jackrabbit/oak/trunk/oak-jcr/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/pom.xml?rev=1355065&r1=1355064&r2=1355065&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-jcr/pom.xml Thu Jun 28 16:23:22 2012
@@ -97,7 +97,6 @@ org.apache.jackrabbit.test.api.observati
org.apache.jackrabbit.test.api.observation.AddEventListenerTest#testPath
org.apache.jackrabbit.test.api.observation.AddEventListenerTest#testNodeType
org.apache.jackrabbit.test.api.observation.AddEventListenerTest#testIsDeepFalseNodeAdded
-org.apache.jackrabbit.test.api.observation.AddEventListenerTest#testIsDeepFalsePropertyAdded
org.apache.jackrabbit.test.api.observation.WorkspaceOperationTest#testCopy <!-- OAK-156 -->
org.apache.jackrabbit.test.api.observation.GetIdentifierTest#testNodeAdded
org.apache.jackrabbit.test.api.observation.GetIdentifierTest#testNodeMoved
Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ChangeFilter.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ChangeFilter.java?rev=1355065&r1=1355064&r2=1355065&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ChangeFilter.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ChangeFilter.java Thu Jun 28 16:23:22 2012
@@ -56,6 +56,8 @@ class ChangeFilter {
}
public boolean includeChildren(String path) {
- return deep && PathUtils.isAncestor(this.path, path);
+ return PathUtils.isAncestor(path, this.path) ||
+ path.equals(this.path) ||
+ deep && PathUtils.isAncestor(this.path, path);
}
}