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

Revert "Fix failing test"

Browse Source 
This reverts commit c01f45fa59.
This commit is contained in:
Rossen Stoyanchev
2013-10-07 21:10:05 -04:00
parent 4bf5a0234c
commit 5c62c86fc9
2 changed files with 13 additions and 7 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,7 +17,6 @@
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;
@@ -322,11 +321,8 @@ public class WebMvcConfigurationSupport implements ApplicationContextAware, Serv
*/
@Bean
public ResourceUrlGenerator resourceUrlGenerator() {
Map<String, ?> handlerMap = Collections.<String, Object>emptyMap();
if (resourceHandlerMapping() instanceof SimpleUrlHandlerMapping) {
handlerMap = ((SimpleUrlHandlerMapping) resourceHandlerMapping()).getUrlMap();
}
return new ResourceUrlGenerator(handlerMap);
SimpleUrlHandlerMapping hm = (SimpleUrlHandlerMapping) resourceHandlerMapping();
return new ResourceUrlGenerator(hm.getUrlMap());
}
/**