Correct check for ViewResolver beans

rstoyanchev · rstoyanchev · commit 803fc2001907 · 2014-09-29T17:59:46.000-04:00
Check for bean names of type rather than actual beans.

Issue: SPR-12267
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
@@ -801,9 +801,9 @@ public ViewResolver mvcViewResolver() {
 		configureViewResolvers(registry);
 
 		if (registry.getViewResolvers().isEmpty()) {
-			Map<String, ViewResolver> map = BeanFactoryUtils.beansOfTypeIncludingAncestors(
+			String[] names = BeanFactoryUtils.beanNamesForTypeIncludingAncestors(
 					this.applicationContext, ViewResolver.class, true, false);
-			if (map.isEmpty()) {
+			if (names.length == 1) {
 				registry.getViewResolvers().add(new InternalResourceViewResolver());
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -801,9 +801,9 @@ public ViewResolver mvcViewResolver() {`
`801`	`801`	`configureViewResolvers(registry);`
`802`	`802`
`803`	`803`	`if (registry.getViewResolvers().isEmpty()) {`
`804`		`- Map<String, ViewResolver> map = BeanFactoryUtils.beansOfTypeIncludingAncestors(`
	`804`	`+ String[] names = BeanFactoryUtils.beanNamesForTypeIncludingAncestors(`
`805`	`805`	`this.applicationContext, ViewResolver.class, true, false);`
`806`		`- if (map.isEmpty()) {`
	`806`	`+ if (names.length == 1) {`
`807`	`807`	`registry.getViewResolvers().add(new InternalResourceViewResolver());`
`808`	`808`	`}`
`809`	`809`	`}`