Avoid eager instantiation of non-singleton FactoryBean in getBeanNamesForType

Closes gh-28616
4 years ago · 0ce9516aef
1 changed files with 2 additions and 1 deletions
--- 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 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
				@@ -585,7 +585,8 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
 							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) {