Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix failing test

Browse Source
This commit is contained in:
Rossen Stoyanchev
2013-10-01 14:56:21 -04:00
parent f8e1f06d08
commit c01f45fa59
2 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java
View File

@@ -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);
}
/**