svn commit: r1771713 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/ChangeSetFilterImpl.java

[stefanegli]

Author: stefanegli
Date: Mon Nov 28 11:15:44 2016
New Revision: 1771713

URL: http://svn.apache.org/viewvc?rev=1771713&view=rev
Log:
OAK-5169 : test fix : maxExcludedPaths correctly taking into account

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

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/ChangeSetFilterImpl.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/ChangeSetFilterImpl.java?rev=1771713&r1=1771712&r2=1771713&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/ChangeSetFilterImpl.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/ChangeSetFilterImpl.java
 Mon Nov 28 11:15:44 2016
@@ -109,7 +109,7 @@ public class ChangeSetFilterImpl impleme
                 this.excludePathPatterns.add(asPattern(concat(aRawExcludePath, 
"**")));
             }
         } else {
-            final Set<String> unprecisePaths = 
unprecisePaths(excludedParentPaths);
+            final Set<String> unprecisePaths = 
unprecisePaths(excludedParentPaths, maxExcludedPaths, 
MAX_EXCLUDE_PATH_CUTOFF_LEVEL);
             for (String anUnprecisePath : unprecisePaths) {
                 
this.unpreciseExcludePathPatterns.add(asPattern(concat(anUnprecisePath, "**")));
             }
@@ -119,11 +119,11 @@ public class ChangeSetFilterImpl impleme
         this.parentNodeNames = parentNodeNames == null ? null : new 
HashSet<String>(parentNodeNames);
     }
     
-    private Set<String> unprecisePaths(Set<String> paths) {
-        int level = MAX_EXCLUDE_PATH_CUTOFF_LEVEL;
+    private Set<String> unprecisePaths(Set<String> paths, int 
maxExcludedPaths, int maxExcludePathCutOffLevel) {
+        int level = maxExcludePathCutOffLevel;
         while(level > 1) {
             Set<String> unprecise = unprecisePaths(paths, level);
-            if (unprecise.size() < MAX_EXCLUDED_PATHS) {
+            if (unprecise.size() < maxExcludedPaths) {
                 return unprecise;
             }
             level--;