Further simplify DefaultSingletonBeanRegistry.isDependent()

sbrannen · sbrannen · commit 6ea4d3794a75 · 2023-07-09T16:11:41.000+02:00
See gh-30841
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultSingletonBeanRegistry.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultSingletonBeanRegistry.java
@@ -447,7 +447,7 @@ private boolean isDependent(String beanName, String dependentBeanName, @Nullable
 		}
 		String canonicalName = canonicalName(beanName);
 		Set<String> dependentBeans = this.dependentBeanMap.get(canonicalName);
-		if (dependentBeans == null) {
+		if (dependentBeans == null || dependentBeans.isEmpty()) {
 			return false;
 		}
 		if (dependentBeans.contains(dependentBeanName)) {

Original file line number	Diff line number	Diff line change
`@@ -447,7 +447,7 @@ private boolean isDependent(String beanName, String dependentBeanName, @Nullable`
`447`	`447`	`}`
`448`	`448`	`String canonicalName = canonicalName(beanName);`
`449`	`449`	`Set<String> dependentBeans = this.dependentBeanMap.get(canonicalName);`
`450`		`- if (dependentBeans == null) {`
	`450`	`+ if (dependentBeans == null \|\| dependentBeans.isEmpty()) {`
`451`	`451`	`return false;`
`452`	`452`	`}`
`453`	`453`	`if (dependentBeans.contains(dependentBeanName)) {`