Rollback AntPathMatcher behavior for ".*" comparisons

Prior to this commit, AntPathMatcher had been refactored for SPR-6741.
During that process, a key feature has been removed:
When comparing two patterns, pattern elements (*, {}, etc) are counted
to score those patterns. When a pattern ends with ".*", the ending
wildcard should not be counted against pattern elements for this
pattern.

This commit reintroduces that behavior.

Issue: SPR-6741
This commit is contained in:
Brian Clozel
2014-06-11 20:43:08 +02:00
parent ce0473f926
commit d746e3fbfa
2 changed files with 7 additions and 2 deletions

View File

@@ -696,11 +696,15 @@ public class AntPathMatcher implements PathMatcher {
this.doubleWildcards++;
pos += 2;
}
else {
else if(!this.pattern.substring(pos - 1).equals(".*")) {
this.singleWildcards++;
pos++;
}
} else {
else {
pos++;
}
}
else {
pos++;
}
}