Author: stefanegli
Date: Fri Nov 11 15:28:02 2016
New Revision: 1769301
URL: http://svn.apache.org/viewvc?rev=1769301&view=rev
Log:
OAK-5099 : a wildcard after starstar was not supported so far - as there was an
explicit equals after starstar matched
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/GlobbingPathFilter.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/GlobbingPathFilter.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/GlobbingPathFilter.java?rev=1769301&r1=1769300&r2=1769301&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/GlobbingPathFilter.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/GlobbingPathFilter.java
Fri Nov 11 15:28:02 2016
@@ -146,7 +146,7 @@ public class GlobbingPathFilter implemen
if (wildcardMatch(name, head)) {
return new GlobbingPathFilter(pattern.subList(1, pattern.size()),
patternMap);
} else if (STAR_STAR.equals(head)) {
- if (pattern.size() >= 2 && pattern.get(1).equals(name)) {
+ if (pattern.size() >= 2 && wildcardMatch(name, pattern.get(1))) {
// ** matches empty list of elements and pattern.get(1)
matches name
// match the rest of the pattern against the rest of the path
and
// match the whole pattern against the rest of the path
