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

[mduerig]

Author: mduerig
Date: Tue Jun 25 16:10:28 2013
New Revision: 1496526

URL: http://svn.apache.org/r1496526
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=1496526&r1=1496525&r2=1496526&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:10:28 2013
@@ -108,7 +108,10 @@ class EventFilter {
         if (!deep && !equalPaths) {
             return false;
         }
-        if (deep && !(PathUtils.isAncestor(this.path, path) || equalPaths)) {
+
+        String thisOakPath = namePathMapper.getOakPath(this.path);
+        String thatOakPath = namePathMapper.getOakPath(path);
+        if (deep && !(PathUtils.isAncestor(thisOakPath, thatOakPath) || 
equalPaths)) {
             return false;
         }
         return true;