From 0105c5ebb9896641bdc601ff164a2404e817e505 Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Thu, 17 May 2012 16:35:55 -0400 Subject: [PATCH] Decode path vars in pre-3.1 `@MVC` support clases too See the commit comments for: https://github.com/SpringSource/spring-framework/commit/57307a0b2e5bce8f70d5deddf8df11d034dc8c5a This commit also applies the change to pre-3.1 `@MVC` suppor classes. Issue: SPR-6951 --- .../web/servlet/handler/AbstractUrlHandlerMapping.java | 7 ++++--- .../mvc/annotation/AnnotationMethodHandlerAdapter.java | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractUrlHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractUrlHandlerMapping.java index cc874c7145..53af31127f 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractUrlHandlerMapping.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractUrlHandlerMapping.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -185,8 +185,9 @@ public abstract class AbstractUrlHandlerMapping extends AbstractHandlerMapping { Map uriTemplateVariables = new LinkedHashMap(); for (String matchingPattern : matchingPatterns) { if (patternComparator.compare(bestPatternMatch, matchingPattern) == 0) { - uriTemplateVariables - .putAll(getPathMatcher().extractUriTemplateVariables(matchingPattern, urlPath)); + Map vars = getPathMatcher().extractUriTemplateVariables(matchingPattern, urlPath); + Map decodedVars = getUrlPathHelper().decodePathVariables(request, vars); + uriTemplateVariables.putAll(decodedVars); } } if (logger.isDebugEnabled()) { diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java index 20dd1d0744..6728ea25c5 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java @@ -750,7 +750,8 @@ public class AnnotationMethodHandlerAdapter extends WebContentGenerator int patternVariableCount = StringUtils.countOccurrencesOf(mappedPattern, "{"); if ((variables == null || patternVariableCount != variables.size()) && pathMatcher.match(mappedPattern, lookupPath)) { variables = pathMatcher.extractUriTemplateVariables(mappedPattern, lookupPath); - request.setAttribute(HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE, variables); + Map decodedVariables = urlPathHelper.decodePathVariables(request, variables); + request.setAttribute(HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE, decodedVariables); } } }