|
|
|
|
@ -220,8 +220,7 @@ public class AntPathMatcher implements PathMatcher {
@@ -220,8 +220,7 @@ public class AntPathMatcher implements PathMatcher {
|
|
|
|
|
if (pathIdxStart > pathIdxEnd) { |
|
|
|
|
// Path is exhausted, only match if rest of pattern is * or **'s
|
|
|
|
|
if (pattIdxStart > pattIdxEnd) { |
|
|
|
|
return (pattern.endsWith(this.pathSeparator) ? path.endsWith(this.pathSeparator) : |
|
|
|
|
!path.endsWith(this.pathSeparator)); |
|
|
|
|
return (pattern.endsWith(this.pathSeparator) == path.endsWith(this.pathSeparator)); |
|
|
|
|
} |
|
|
|
|
if (!fullMatch) { |
|
|
|
|
return true; |
|
|
|
|
@ -324,10 +323,7 @@ public class AntPathMatcher implements PathMatcher {
@@ -324,10 +323,7 @@ public class AntPathMatcher implements PathMatcher {
|
|
|
|
|
pos += skipped; |
|
|
|
|
skipped = skipSegment(path, pos, pattDir); |
|
|
|
|
if (skipped < pattDir.length()) { |
|
|
|
|
if (skipped > 0) { |
|
|
|
|
return true; |
|
|
|
|
} |
|
|
|
|
return (pattDir.length() > 0) && isWildcardChar(pattDir.charAt(0)); |
|
|
|
|
return (skipped > 0 || (pattDir.length() > 0 && isWildcardChar(pattDir.charAt(0)))); |
|
|
|
|
} |
|
|
|
|
pos += skipped; |
|
|
|
|
} |
|
|
|
|
|