From c01f45fa59db126e928affccad596eca45c8c202 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@gopivotal.com>
Date: Tue, 1 Oct 2013 14:56:21 -0400
Subject: [PATCH] Fix failing test

---
 .../annotation/WebMvcConfigurationSupport.java       |  8 ++++++--
 .../web/servlet/resource/ResourceUrlFilterTests.java | 12 +-----------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java
index 915e0eacf8..e75f063216 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java
@@ -17,6 +17,7 @@
 package org.springframework.web.servlet.config.annotation;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -321,8 +322,11 @@ public class WebMvcConfigurationSupport implements ApplicationContextAware, Serv
 	 */
 	@Bean
 	public ResourceUrlGenerator resourceUrlGenerator() {
-		SimpleUrlHandlerMapping hm = (SimpleUrlHandlerMapping) resourceHandlerMapping();
-		return new ResourceUrlGenerator(hm.getUrlMap());
+		Map<String, ?> handlerMap = Collections.<String, Object>emptyMap();
+		if (resourceHandlerMapping() instanceof SimpleUrlHandlerMapping) {
+			handlerMap = ((SimpleUrlHandlerMapping) resourceHandlerMapping()).getUrlMap();
+		}
+		return new ResourceUrlGenerator(handlerMap);
 	}
 
 	/**
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceUrlFilterTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceUrlFilterTests.java
index 6fce573141..060b235158 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceUrlFilterTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceUrlFilterTests.java
@@ -17,7 +17,6 @@
 package org.springframework.web.servlet.resource;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 import javax.servlet.ServletException;
@@ -26,7 +25,6 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.junit.Test;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.mock.web.test.MockFilterChain;
 import org.springframework.mock.web.test.MockHttpServletRequest;
@@ -36,7 +34,6 @@ import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
-import org.springframework.web.servlet.handler.SimpleUrlHandlerMapping;
 
 import static org.junit.Assert.*;
 
@@ -120,6 +117,7 @@ public class ResourceUrlFilterTests {
 	@Configuration
 	static class WebConfig extends WebMvcConfigurationSupport {
 
+
 		@Override
 		public void addResourceHandlers(ResourceHandlerRegistry registry) {
 
@@ -131,14 +129,6 @@ public class ResourceUrlFilterTests {
 				.addResourceLocations("classpath:org/springframework/web/servlet/resource/test/")
 				.setResourceResolvers(resourceResolvers);
 		}
-
-		@Bean
-		public ResourceUrlGenerator resourceUrlGenerator() {
-			ResourceUrlGenerator generator = new ResourceUrlGenerator();
-			SimpleUrlHandlerMapping handlerMapping = (SimpleUrlHandlerMapping) resourceHandlerMapping();
-			generator.setResourceHandlerMappings(Collections.singletonList(handlerMapping));
-			return generator;
-		}
 	}
 
 	private static class TestServlet extends HttpServlet {