root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

SPR-5924 - REOPENED -PathVariable mappings are greedy over hard coded mappings

This commit is contained in:
Arjen Poutsma 2009-07-14 07:08:02 +00:00
parent 252bd3942c
commit 8073efd69f
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -409,7 +409,7 @@ public class AntPathMatcher implements PathMatcher {
if (bracketCount1 < bracketCount2) {
return -1;
}
else if (bracketCount1 < bracketCount2) {
else if (bracketCount2 < bracketCount1) {
return 1;
}
return 0;

1
org.springframework.core/src/test/java/org/springframework/util/AntPathMatcherTests.java
View File

@ -388,6 +388,7 @@ public class AntPathMatcherTests {
assertEquals(1, comparator.compare("/hotels/{hotel}", "/hotels/new"));
assertEquals(0, comparator.compare("/hotels/{hotel}", "/hotels/{hotel}"));
assertEquals(-1, comparator.compare("/hotels/{hotel}/booking", "/hotels/{hotel}/bookings/{booking}"));
assertEquals(1, comparator.compare("/hotels/{hotel}/bookings/{booking}", "/hotels/{hotel}/booking"));
assertEquals(-1, comparator.compare("/hotels/{hotel}", "/hotels/*"));
assertEquals(1, comparator.compare("/hotels/*", "/hotels/{hotel}"));