Merge branch '3.5.x'

philwebb · philwebb · commit 5ce1438be622 · 2025-10-14T14:20:22.000-07:00
diff --git a/core/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java b/core/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java
@@ -279,10 +279,10 @@ private Set<String> matchedNamesFrom(Map<String, @Nullable BeanDefinition> named
 
 	private boolean isCandidate(ConfigurableListableBeanFactory beanFactory, String name,
 			@Nullable 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
`@@ -279,10 +279,10 @@ private Set<String> matchedNamesFrom(Map<String, @Nullable BeanDefinition> named`
`279`	`279`
`280`	`280`	`private boolean isCandidate(ConfigurableListableBeanFactory beanFactory, String name,`
`281`	`281`	`@Nullable BeanDefinition definition, Set<String> ignoredBeans) {`
`282`		`- if (ignoredBeans.contains(name) \|\| definition == null) {`
	`282`	`+ if (ignoredBeans.contains(name)) {`
`283`	`283`	`return false;`
`284`	`284`	`}`
`285`		`- if (definition.isAutowireCandidate() && isDefaultCandidate(definition)) {`
	`285`	`+ if (definition == null \|\| (definition.isAutowireCandidate() && isDefaultCandidate(definition))) {`
`286`	`286`	`return true;`
`287`	`287`	`}`
`288`	`288`	`if (ScopedProxyUtils.isScopedTarget(name)) {`