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

SPR-6280 - PathVariable resolution does not work properly

Browse Source
This commit is contained in:
Arjen Poutsma
2009-11-24 13:53:37 +00:00
parent be60908d6d
commit ef50082cad
6 changed files with 102 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/AbstractUrlHandlerMapping.java
View File

@@ -19,6 +19,8 @@ package org.springframework.web.servlet.handler;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.List;
import java.util.ArrayList;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -214,13 +216,20 @@ public abstract class AbstractUrlHandlerMapping extends AbstractHandlerMapping {
return buildPathExposingHandler(handler, urlPath, null);
}
// Pattern match?
String bestPathMatch = null;
List<String> matchingPaths = new ArrayList<String>();
for (String registeredPath : this.handlerMap.keySet()) {
if (getPathMatcher().match(registeredPath, urlPath) &&
(bestPathMatch == null || bestPathMatch.length() < registeredPath.length())) {
bestPathMatch = registeredPath;
if (getPathMatcher().match(registeredPath, urlPath)) {
matchingPaths.add(registeredPath);
}
}
String bestPathMatch = null;
if (!matchingPaths.isEmpty()) {
Collections.sort(matchingPaths, getPathMatcher().getPatternComparator(urlPath));
if (logger.isDebugEnabled()) {
logger.debug("Matching path for request [" + urlPath + "] are " + matchingPaths);
}
bestPathMatch = matchingPaths.get(0);
}
if (bestPathMatch != null) {
handler = this.handlerMap.get(bestPathMatch);
// Bean name or resolved handler?