root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Correct check for ViewResolver beans 

Check for bean names of type rather than actual beans.

Issue: SPR-12267
This commit is contained in:
Rossen Stoyanchev 2014-09-29 17:53:28 -04:00
parent 7bc8e5199e
commit 803fc20019
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -801,9 +801,9 @@ public class WebMvcConfigurationSupport implements ApplicationContextAware, Serv
configureViewResolvers(registry); configureViewResolvers(registry);
if (registry.getViewResolvers().isEmpty()) { if (registry.getViewResolvers().isEmpty()) {
Map<String, ViewResolver> map = BeanFactoryUtils.beansOfTypeIncludingAncestors( String[] names = BeanFactoryUtils.beanNamesForTypeIncludingAncestors(
this.applicationContext, ViewResolver.class, true, false); this.applicationContext, ViewResolver.class, true, false);
if (map.isEmpty()) { if (names.length == 1) {
registry.getViewResolvers().add(new InternalResourceViewResolver()); registry.getViewResolvers().add(new InternalResourceViewResolver());
} }
} }