Decode path vars in pre-3.1 @MVC support clases too

See the commit comments for:
57307a0

This commit also applies the change to pre-3.1 `@MVC` suppor classes.

Issue: SPR-6951

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 @@ protected Object lookupHandler(String urlPath, HttpServletRequest request) throw
 			Map<String, String> uriTemplateVariables = new LinkedHashMap<String, String>();
 			for (String matchingPattern : matchingPatterns) {
 				if (patternComparator.compare(bestPatternMatch, matchingPattern) == 0) {
-					uriTemplateVariables
-							.putAll(getPathMatcher().extractUriTemplateVariables(matchingPattern, urlPath));
+					Map<String, String> vars = getPathMatcher().extractUriTemplateVariables(matchingPattern, urlPath);
+					Map<String, String> decodedVars = getUrlPathHelper().decodePathVariables(request, vars);
+					uriTemplateVariables.putAll(decodedVars);
 				}
 			}
 			if (logger.isDebugEnabled()) {

spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java

@@ -750,7 +750,8 @@ private void extractHandlerMethodUriTemplates(String mappedPattern, String looku
 			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<String, String> decodedVariables = urlPathHelper.decodePathVariables(request, variables);
+				request.setAttribute(HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE, decodedVariables);
 			}
 		}
 	}