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:10:10 UTC

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

Author: mduerig
Date: Tue Jun 25 16:10:09 2013
New Revision: 1496525

URL: http://svn.apache.org/r1496525
Log:
OAK-880: ChangeProcessor causes IllegalArgumentException when path filter ends with a slash
convert jcr path to oak path before passing it to ChangeSet.diff

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

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/ChangeProcessor.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/ChangeProcessor.java?rev=1496525&r1=1496524&r2=1496525&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/ChangeProcessor.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/ChangeProcessor.java Tue Jun 25 16:10:09 2013
@@ -165,7 +165,8 @@ class ChangeProcessor implements Runnabl
                 EventFilter filter = filterRef.get();
                 if (!(filter.excludeLocal() && changes.isLocal(observationManager.getContentSession()))) {
                     EventGeneratingNodeStateDiff diff = new EventGeneratingNodeStateDiff(changes);
-                    changes.diff(VisibleDiff.wrap(diff), filter.getPath());
+                    String path = namePathMapper.getOakPath(filter.getPath());
+                    changes.diff(VisibleDiff.wrap(diff), path);
                     if (!stopping) {
                         diff.sendEvents();
                     }