Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove a unnecessary else in DefaultSingletonBeanRegistry #33502

Closed
wants to merge 3 commits into from
Closed

Remove a unnecessary else in DefaultSingletonBeanRegistry #33502

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1606a8a
Remove a unnecessary else in DefaultSingletonBeanRegistry
liuao1004 Sep 6, 2024
5b0ec54
Remove an unnecessary else in DefaultSingletonBeanRegistry
liuao1004 Sep 6, 2024
78067f4
Merge remote-tracking branch 'origin/main'
cjLiuao Sep 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions ...src/main/java/org/springframework/beans/factory/support/DefaultSingletonBeanRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,15 +264,13 @@ public Object getSingleton(String beanName, ObjectFactory<?> singletonFactory) {
"\" holds singleton lock for other beans " + this.singletonsCurrentlyInCreation);
}
}
else {
// Singleton lock currently held by some other registration method -> wait.
this.singletonLock.lock();
locked = true;
// Singleton object might have possibly appeared in the meantime.
singletonObject = this.singletonObjects.get(beanName);
if (singletonObject != null) {
return singletonObject;
}
// Singleton lock currently held by some other registration method -> wait.
this.singletonLock.lock();
locked = true;
// Singleton object might have possibly appeared in the meantime.
singletonObject = this.singletonObjects.get(beanName);
if (singletonObject != null) {
return singletonObject;
}
}
}
Expand Down