Skip to content

Commit 85eec5d

Browse files
bnbakp0582sbrannen
authored andcommitted
Simplify DefaultSingletonBeanRegistry.isDependent()
Move `alreadySeen` handling out of for-loop. Closes gh-30841
1 parent 0961bc5 commit 85eec5d

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultSingletonBeanRegistry.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -453,11 +453,11 @@ private boolean isDependent(String beanName, String dependentBeanName, @Nullable
453453
if (dependentBeans.contains(dependentBeanName)) {
454454
return true;
455455
}
456+
if (alreadySeen == null) {
457+
alreadySeen = new HashSet<>();
458+
}
459+
alreadySeen.add(beanName);
456460
for (String transitiveDependency : dependentBeans) {
457-
if (alreadySeen == null) {
458-
alreadySeen = new HashSet<>();
459-
}
460-
alreadySeen.add(beanName);
461461
if (isDependent(transitiveDependency, dependentBeanName, alreadySeen)) {
462462
return true;
463463
}

0 commit comments

Comments
 (0)