From d85c1fbdd5edb6b2ba906f8a20009317ff7faa98 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@pivotal.io>
Date: Thu, 4 Sep 2014 00:11:28 -0400
Subject: [PATCH] Fix initialization issue in ResourceUrlProvider

Before this change ResourceUrlProvider used getUrlMap to detect
ResourceHttpRequestHandler instances, however the map may contain bean
names as is the case when using <mvc:resources>. Instead it now uses
getHandlerMap.
---
 .../web/servlet/resource/ResourceUrlProvider.java             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceUrlProvider.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceUrlProvider.java
index 0b30b58bc47..519526fefe5 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceUrlProvider.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceUrlProvider.java
@@ -143,8 +143,8 @@ public class ResourceUrlProvider implements ApplicationListener<ContextRefreshed
 		Collections.sort(handlerMappings, new OrderComparator());
 
 		for (SimpleUrlHandlerMapping hm : handlerMappings) {
-			for (String pattern : hm.getUrlMap().keySet()) {
-				Object handler = hm.getUrlMap().get(pattern);
+			for (String pattern : hm.getHandlerMap().keySet()) {
+				Object handler = hm.getHandlerMap().get(pattern);
 				if (handler instanceof ResourceHttpRequestHandler) {
 					ResourceHttpRequestHandler resourceHandler = (ResourceHttpRequestHandler) handler;
 					if (logger.isDebugEnabled()) {