From efb0ab79f9091f4c4b613676a7625d242be94f3f Mon Sep 17 00:00:00 2001 From: Arjen Poutsma Date: Wed, 19 Nov 2008 17:12:44 +0000 Subject: [PATCH] SPR-5251: URI Templates support relative @RequestMappings (on class level, with more specific mapping on method level) --- .../mvc/annotation/AnnotationMethodHandlerAdapter.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java index b805b0fb8e..8615573948 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java @@ -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 {