From a42636035ef5e72f7fa1f64e4d33d954dc615102 Mon Sep 17 00:00:00 2001 From: Seonghun Jeong Date: Sat, 12 Apr 2025 22:39:53 +0900 Subject: [PATCH 1/2] Refactor variable usage in isCurrentThreadAllowedToHoldSingletonLock method Signed-off-by: Seonghun Jeong --- .../beans/factory/support/DefaultListableBeanFactory.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java index 2d3ef536e81a..94d666e10afb 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java @@ -1048,7 +1048,7 @@ protected void checkMergedBeanDefinition(RootBeanDefinition mbd, String beanName @Override protected @Nullable Boolean isCurrentThreadAllowedToHoldSingletonLock() { String mainThreadPrefix = this.mainThreadPrefix; - if (this.mainThreadPrefix != null) { + if (mainThreadPrefix != null) { // We only differentiate in the preInstantiateSingletons phase. PreInstantiation preInstantiation = this.preInstantiationThread.get(); From 03f2ff6c1be215df89f1b7335a428c1e6708bbe4 Mon Sep 17 00:00:00 2001 From: Seonghun Jeong Date: Sat, 12 Apr 2025 22:43:33 +0900 Subject: [PATCH 2/2] Remove redundant null check Signed-off-by: Seonghun Jeong --- .../beans/factory/support/DefaultListableBeanFactory.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java index 94d666e10afb..979a7d188018 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java @@ -1069,7 +1069,7 @@ protected void checkMergedBeanDefinition(RootBeanDefinition mbd, String beanName } else if (this.strictLocking == null) { // No explicit locking configuration -> infer appropriate locking. - if (mainThreadPrefix != null && !getThreadNamePrefix().equals(mainThreadPrefix)) { + if (!getThreadNamePrefix().equals(mainThreadPrefix)) { // An unmanaged thread (assumed to be application-internal) with lenient locking, // and not part of the same thread pool that provided the main bootstrap thread // (excluding scenarios where we are hit by multiple external bootstrap threads).