Author: stefanegli
Date: Fri Nov 4 13:32:22 2016
New Revision: 1768030
URL: http://svn.apache.org/viewvc?rev=1768030&view=rev
Log:
OAK-5021 related : another test variant added which unveiled a buglet in the
globPathAsRegex, fixed that
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/GlobbingPathHelper.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/observation/filter/GlobbingPathHelperTest.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/GlobbingPathHelper.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/GlobbingPathHelper.java?rev=1768030&r1=1768029&r2=1768030&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/GlobbingPathHelper.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/filter/GlobbingPathHelper.java
Fri Nov 4 13:32:22 2016
@@ -75,7 +75,7 @@ public class GlobbingPathHelper {
}
if (pathElem.equals("**")) {
addSlash = false;
- sb.append("\\E[^/]*(/[^/]*)*\\Q");
+ sb.append("\\E([^/]*/)*\\Q");
} else {
sb.append(pathElem.replace("*", "\\E[^/]*\\Q"));
addSlash = true;
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/observation/filter/GlobbingPathHelperTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/observation/filter/GlobbingPathHelperTest.java?rev=1768030&r1=1768029&r2=1768030&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/observation/filter/GlobbingPathHelperTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/observation/filter/GlobbingPathHelperTest.java
Fri Nov 4 13:32:22 2016
@@ -55,6 +55,11 @@ public class GlobbingPathHelperTest {
assertMatches("**/bar/**/foo", "bar/a/b/c/foo");
assertMatches("**/bar/**/foo", "/bar/a/b/c/foo");
+
+ assertMatches("/a/b/**/foo/*", "/a/b/foo/xy");
+ assertDoesntMatch("/a/b/**/foo/*", "/a/b/barfoo/xy");
+ assertDoesntMatch("/a/b/**/foo/*", "/a/bbar/foo/xy");
+ assertDoesntMatch("/a/b/**/foo/*", "/a/bbar/barfoo/xy");
}
@Test
