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 2013/06/25 18:52:17 UTC

svn commit: r1496536 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/EventFilter.java

Author: mduerig
Date: Tue Jun 25 16:52:17 2013
New Revision: 1496536

URL: http://svn.apache.org/r1496536
Log:
OAK-144 Implement Observation
path inclusion filter should operate on oak path in order to determine equivalencies of path with expanded names vs. path with non expanded names

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/EventFilter.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/EventFilter.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/EventFilter.java?rev=1496536&r1=1496535&r2=1496536&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/EventFilter.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/EventFilter.java Tue Jun 25 16:52:17 2013
@@ -72,9 +72,12 @@ class EventFilter {
     }
 
     public boolean includeChildren(String path) {
-        return PathUtils.isAncestor(path, this.path) ||
-                path.equals(this.path) ||
-                deep && PathUtils.isAncestor(this.path, path);
+        String thisOakPath = namePathMapper.getOakPath(this.path);
+        String thatOakPath = namePathMapper.getOakPath(path);
+
+        return PathUtils.isAncestor(thatOakPath, thisOakPath) ||
+                path.equals(thisOakPath) ||
+                deep && PathUtils.isAncestor(thisOakPath, thatOakPath);
     }
 
     public boolean excludeLocal() {