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

More refinements for combine()

Browse Source
This commit is contained in:
Arjen Poutsma
2009-04-03 11:35:18 +00:00
parent 5dbae2c979
commit 07e6d9d966
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
org.springframework.core/src/main/java/org/springframework/util/AntPathMatcher.java
View File

@@ -348,8 +348,9 @@ public class AntPathMatcher implements PathMatcher {
}
}
else {
int idx = pattern1.indexOf("*.");
int idx = pattern1.indexOf(".");
if (idx == -1) {
// all other cases: simply concatenate the two patterns
if (pattern1.endsWith("/") || pattern2.startsWith("/")) {
return pattern1 + pattern2;
}
@@ -359,8 +360,7 @@ public class AntPathMatcher implements PathMatcher {
}
else {
// /*.html + /hotels.html -> /hotels.html
String extension = pattern1.substring(idx + 1);
if (pattern2.endsWith(extension)) {
if (match(pattern1, pattern2)) {
return pattern2;
}
else {