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

SPR-5251: URI Templates support relative @RequestMappings (on class level, with more specific mapping on method level)

Browse Source
This commit is contained in:
Arjen Poutsma
2008-11-19 17:12:44 +00:00
parent 27ed13f44d
commit efb0ab79f9
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java
View File

@@ -504,7 +504,9 @@ public class AnnotationMethodHandlerAdapter extends WebContentGenerator implemen
}
}
if (targetHandlerMethods.size() == 1) {
extractHandlerMethodUriTemplates(targetPathMatches.values().iterator().next(), lookupPath, request);
if (targetPathMatches.size() == 1) {
extractHandlerMethodUriTemplates(targetPathMatches.values().iterator().next(), lookupPath, request);
}
return targetHandlerMethods.values().iterator().next();
}
else if (!targetHandlerMethods.isEmpty()) {
@@ -527,7 +529,9 @@ public class AnnotationMethodHandlerAdapter extends WebContentGenerator implemen
}
}
}
extractHandlerMethodUriTemplates(bestPathMatch, lookupPath, request);
if (bestPathMatch != null) {
extractHandlerMethodUriTemplates(bestPathMatch, lookupPath, request);
}
return targetHandlerMethods.get(bestMappingMatch);
}
else {