Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 46d98a6

Browse files
Claudenwslachiewicz
authored andcommitted
fix for issue #279
1 parent 1f55ae1 commit 46d98a6

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/main/java/org/codehaus/plexus/util/SelectorUtils.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ public static boolean matchPatternStart(String pattern, String str, boolean isCa
140140
}
141141

142142
public static boolean isAntPrefixedPattern(String pattern) {
143-
return pattern.length() > (ANT_HANDLER_PREFIX.length() + PATTERN_HANDLER_SUFFIX.length() + 1)
143+
return pattern.length() > (ANT_HANDLER_PREFIX.length() + PATTERN_HANDLER_SUFFIX.length())
144144
&& pattern.startsWith(ANT_HANDLER_PREFIX)
145145
&& pattern.endsWith(PATTERN_HANDLER_SUFFIX);
146146
}
@@ -254,7 +254,7 @@ private static String toOSRelatedPath(String pattern, String separator) {
254254
}
255255

256256
public static boolean isRegexPrefixedPattern(String pattern) {
257-
return pattern.length() > (REGEX_HANDLER_PREFIX.length() + PATTERN_HANDLER_SUFFIX.length() + 1)
257+
return pattern.length() > (REGEX_HANDLER_PREFIX.length() + PATTERN_HANDLER_SUFFIX.length())
258258
&& pattern.startsWith(REGEX_HANDLER_PREFIX)
259259
&& pattern.endsWith(PATTERN_HANDLER_SUFFIX);
260260
}

src/test/java/org/codehaus/plexus/util/SelectorUtilsTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public void testExtractPattern() {
4949
*/
5050
@Test
5151
public void testIsAntPrefixedPattern() {
52-
assertFalse(SelectorUtils.isAntPrefixedPattern("%ant[A]")); // single char not allowed
52+
assertTrue(SelectorUtils.isAntPrefixedPattern("%ant[A]")); // single char not allowed
5353
assertTrue(SelectorUtils.isAntPrefixedPattern("%ant[AB]"));
5454
assertFalse(SelectorUtils.isAntPrefixedPattern("%ant[]"));
5555
assertFalse(SelectorUtils.isAntPrefixedPattern("*"));
@@ -60,7 +60,7 @@ public void testIsAntPrefixedPattern() {
6060
*/
6161
@Test
6262
public void testIsRegexPrefixedPattern() {
63-
assertFalse(SelectorUtils.isRegexPrefixedPattern("%regex[A]")); // single char not allowed
63+
assertTrue(SelectorUtils.isRegexPrefixedPattern("%regex[A]")); // single char not allowed
6464
assertTrue(SelectorUtils.isRegexPrefixedPattern("%regex[.*]"));
6565
assertFalse(SelectorUtils.isRegexPrefixedPattern("%regex[]"));
6666
assertFalse(SelectorUtils.isRegexPrefixedPattern("*"));

0 commit comments

Comments
 (0)