Avoid eager instantiation of non-singleton FactoryBean in getBeanName…

…sForType Closes gh-28616
spring-projects · Jun 14, 2022 · 0ce9516 · 0ce9516
1 parent e47cc44
commit 0ce9516
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/...s/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java b/...s/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) {