Avoid eager instantiation of non-singleton FactoryBean in getBeanNamesForType

fsgonz · sbrannen · commit 0ce9516aeff0 · 2022-06-14T16:42:31.000+02:00
Closes gh-28616
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java
@@ -585,7 +585,8 @@ private String[] doGetBeanNamesForType(ResolvableType type, boolean includeNonSi
 							if (!matchFound) {
 								// In case of FactoryBean, try to match FactoryBean instance itself next.
 								beanName = FACTORY_BEAN_PREFIX + beanName;
-								matchFound = isTypeMatch(beanName, type, allowFactoryBeanInit);
+								matchFound = (includeNonSingletons || isSingleton(beanName, mbd, dbd)) && isTypeMatch(beanName, type, allowFactoryBeanInit);
+
 							}
 						}
 						if (matchFound) {

Original file line number	Diff line number	Diff line change
`@@ -585,7 +585,8 @@ private String[] doGetBeanNamesForType(ResolvableType type, boolean includeNonSi`
`585`	`585`	`if (!matchFound) {`
`586`	`586`	`// In case of FactoryBean, try to match FactoryBean instance itself next.`
`587`	`587`	`beanName = FACTORY_BEAN_PREFIX + beanName;`
`588`		`- matchFound = isTypeMatch(beanName, type, allowFactoryBeanInit);`
	`588`	`+ matchFound = (includeNonSingletons \|\| isSingleton(beanName, mbd, dbd)) && isTypeMatch(beanName, type, allowFactoryBeanInit);`
	`589`	`+`
`589`	`590`	`}`
`590`	`591`	`}`
`591`	`592`	`if (matchFound) {`