From 682ad665f51ede9d33bcb934e355f52b5e1ce218 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Tue, 14 Oct 2025 14:18:38 -0700 Subject: [PATCH] Fix 'Check scoped proxy target for isDefaultCandidate' Fix accidental logic issue introduced in commit c14b57a3eb. See gh-47633 --- .../boot/autoconfigure/condition/OnBeanCondition.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 index a995b9957ed..8493b57e16c 100644 --- 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 @@ -270,10 +270,10 @@ class OnBeanCondition extends FilteringSpringBootCondition implements Configurat private boolean isCandidate(ConfigurableListableBeanFactory beanFactory, String name, BeanDefinition definition, Set 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)) {