Merge branch '3.4.x' into 3.5.x

philwebb · philwebb · commit 1d6483c9e78a · 2025-10-14T14:19:39.000-07:00
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java
@@ -271,10 +271,10 @@ private Set<String> matchedNamesFrom(Map<String, BeanDefinition> namedDefinition
 
 	private boolean isCandidate(ConfigurableListableBeanFactory beanFactory, String name, BeanDefinition definition,
 			Set<String> ignoredBeans) {
-		if (ignoredBeans.contains(name) || definition == null) {
+		if (ignoredBeans.contains(name)) {
 			return false;
 		}
-		if (definition.isAutowireCandidate() && isDefaultCandidate(definition)) {
+		if (definition == null || (definition.isAutowireCandidate() && isDefaultCandidate(definition))) {
 			return true;
 		}
 		if (ScopedProxyUtils.isScopedTarget(name)) {

Original file line number	Diff line number	Diff line change
`@@ -271,10 +271,10 @@ private Set<String> matchedNamesFrom(Map<String, BeanDefinition> namedDefinition`
`271`	`271`
`272`	`272`	`private boolean isCandidate(ConfigurableListableBeanFactory beanFactory, String name, BeanDefinition definition,`
`273`	`273`	`Set<String> ignoredBeans) {`
`274`		`- if (ignoredBeans.contains(name) \|\| definition == null) {`
	`274`	`+ if (ignoredBeans.contains(name)) {`
`275`	`275`	`return false;`
`276`	`276`	`}`
`277`		`- if (definition.isAutowireCandidate() && isDefaultCandidate(definition)) {`
	`277`	`+ if (definition == null \|\| (definition.isAutowireCandidate() && isDefaultCandidate(definition))) {`
`278`	`278`	`return true;`
`279`	`279`	`}`
`280`	`280`	`if (ScopedProxyUtils.isScopedTarget(name)) {`