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/11/19 16:47:50 UTC
svn commit: r1543461 - in
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter:
Filters.java PathFilter.java
Author: mduerig
Date: Tue Nov 19 15:47:50 2013
New Revision: 1543461
URL: http://svn.apache.org/r1543461
Log:
OAK-1133: Observation listener PLUS
Don't further decent into subtrees where not necessary
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/Filters.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/PathFilter.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/Filters.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/Filters.java?rev=1543461&r1=1543460&r2=1543461&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/Filters.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/Filters.java Tue Nov 19 15:47:50 2013
@@ -220,7 +220,9 @@ public final class Filters {
List<Filter> childFilters = Lists.newArrayList();
for (Filter filter : filters) {
Filter childFilter = filter.create(name, before, after);
- if (childFilter != null) {
+ if (childFilter == null) {
+ return null;
+ } else {
childFilters.add(childFilter);
}
}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/PathFilter.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/PathFilter.java?rev=1543461&r1=1543460&r2=1543461&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/PathFilter.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/PathFilter.java Tue Nov 19 15:47:50 2013
@@ -77,7 +77,7 @@ public class PathFilter implements Filte
@Override
public Filter create(String name, NodeState before, NodeState after) {
- if (includeChildren(afterTree.getPath())) {
+ if (includeChildren(PathUtils.concat(afterTree.getPath(), name))) {
return new PathFilter(afterTree.getChild(name), path, deep);
} else {
return null;