Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improvement in AntPathMatcher.combine method

Browse Source 
Issues: SPR-7970
This commit is contained in:
Rossen Stoyanchev
2012-04-02 15:06:20 -04:00
parent 4653dbe73f
commit 9833a4c385
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-core/src/main/java/org/springframework/util/AntPathMatcher.java
View File

@@ -299,7 +299,9 @@ public class AntPathMatcher implements PathMatcher {
else if (!StringUtils.hasText(pattern2)) {
return pattern1;
}
else if (!pattern1.contains("{") && match(pattern1, pattern2)) {
else if (!pattern1.equals(pattern2) && !pattern1.contains("{") && match(pattern1, pattern2)) {
// /* + /hotel -> /hotel ; "/*.*" + "/*.html" -> /*.html
// However /user + /user -> /usr/user ; /{foo} + /bar -> /{foo}/bar
return pattern2;
}
else if (pattern1.endsWith("/*")) {