spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-10-02 07:19:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '3.5.x'

Browse Source
This commit is contained in:
Phillip Webb
2025-10-14 14:20:22 -07:00
parent 32ca67abc7 1d6483c9e7
commit 5ce1438be6
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java
+2 -2
View File
@@ -279,10 +279,10 @@ class OnBeanCondition extends FilteringSpringBootCondition implements Configurat
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)) {