Merge branch '6.2.x'

# Conflicts:
#	spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java

Author: jhoeller

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

@@ -138,8 +138,6 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
 	 */
 	public static final String STRICT_LOCKING_PROPERTY_NAME = "spring.locking.strict";
 
-	private static final boolean lenientLockingAllowed = !SpringProperties.getFlag(STRICT_LOCKING_PROPERTY_NAME);
-
 	private static @Nullable Class<?> jakartaInjectProviderClass;
 
 	static {
@@ -158,6 +156,9 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
 	private static final Map<String, Reference<DefaultListableBeanFactory>> serializableFactories =
 			new ConcurrentHashMap<>(8);
 
+	/** Whether lenient locking is allowed in this factory. */
+	private final boolean lenientLockingAllowed = !SpringProperties.getFlag(STRICT_LOCKING_PROPERTY_NAME);
+
 	/** Optional id for this factory, for serialization purposes. */
 	private @Nullable String serializationId;
 
@@ -1035,7 +1036,7 @@ protected void checkMergedBeanDefinition(RootBeanDefinition mbd, String beanName
 
 	@Override
 	protected @Nullable Boolean isCurrentThreadAllowedToHoldSingletonLock() {
-		return (lenientLockingAllowed && this.preInstantiationPhase ?
+		return (this.lenientLockingAllowed && this.preInstantiationPhase ?
 				this.preInstantiationThread.get() != PreInstantiation.BACKGROUND : null);
 	}
 

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

@@ -111,6 +111,9 @@ public class DefaultSingletonBeanRegistry extends SimpleAliasRegistry implements
 	/** Names of beans that are currently in lenient creation. */
 	private final Set<String> singletonsInLenientCreation = new HashSet<>();
 
+	/** Map from bean name to actual creation thread for leniently created beans. */
+	private final Map<String, Thread> lenientCreationThreads = new ConcurrentHashMap<>();
+
 	/** Flag that indicates whether we're currently within destroySingletons. */
 	private volatile boolean singletonsCurrentlyInDestruction = false;
 
@@ -305,6 +308,9 @@ public Object getSingleton(String beanName, ObjectFactory<?> singletonFactory) {
 							if (!this.singletonsInLenientCreation.contains(beanName)) {
 								break;
 							}
+							if (this.lenientCreationThreads.get(beanName) == Thread.currentThread()) {
+								throw ex;
+							}
 							try {
 								this.lenientCreationFinished.await();
 							}
@@ -342,7 +348,18 @@ public Object getSingleton(String beanName, ObjectFactory<?> singletonFactory) {
 					// Leniently created singleton object could have appeared in the meantime.
 					singletonObject = this.singletonObjects.get(beanName);
 					if (singletonObject == null) {
-						singletonObject = singletonFactory.getObject();
+						if (locked) {
+							singletonObject = singletonFactory.getObject();
+						}
+						else {
+							this.lenientCreationThreads.put(beanName, Thread.currentThread());
+							try {
+								singletonObject = singletonFactory.getObject();
+							}
+							finally {
+								this.lenientCreationThreads.remove(beanName);
+							}
+						}
 						newSingleton = true;
 					}
 				}

spring-context/src/test/java/org/springframework/context/annotation/BackgroundBootstrapTests.java

@@ -19,7 +19,9 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout;
 
+import org.springframework.beans.factory.BeanCurrentlyInCreationException;
 import org.springframework.beans.factory.ObjectProvider;
+import org.springframework.beans.factory.UnsatisfiedDependencyException;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.testfixture.beans.TestBean;
@@ -29,6 +31,7 @@
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.springframework.context.annotation.Bean.Bootstrap.BACKGROUND;
 import static org.springframework.core.testfixture.TestGroup.LONG_RUNNING;
 
@@ -85,6 +88,15 @@ void bootstrapWithCircularReference() {
 		ctx.close();
 	}
 
+	@Test
+	@Timeout(5)
+	@EnabledForTestGroups(LONG_RUNNING)
+	void bootstrapWithCircularReferenceInSameThread() {
+		assertThatExceptionOfType(UnsatisfiedDependencyException.class)
+				.isThrownBy(() -> new AnnotationConfigApplicationContext(CircularReferenceInSameThreadBeanConfig.class))
+				.withRootCauseInstanceOf(BeanCurrentlyInCreationException.class);
+	}
+
 	@Test
 	@Timeout(5)
 	@EnabledForTestGroups(LONG_RUNNING)
@@ -179,7 +191,7 @@ public TestBean testBean1(ObjectProvider<TestBean> testBean2) {
 			catch (InterruptedException ex) {
 				throw new RuntimeException(ex);
 			}
-			return new TestBean();
+			return new TestBean("testBean1");
 		}
 
 		@Bean
@@ -217,6 +229,39 @@ public TestBean testBean2(TestBean testBean1) {
 	}
 
 
+	@Configuration(proxyBeanMethods = false)
+	static class CircularReferenceInSameThreadBeanConfig {
+
+		@Bean
+		public TestBean testBean1(ObjectProvider<TestBean> testBean2) {
+			new Thread(testBean2::getObject).start();
+			try {
+				Thread.sleep(1000);
+			}
+			catch (InterruptedException ex) {
+				throw new RuntimeException(ex);
+			}
+			return new TestBean();
+		}
+
+		@Bean
+		public TestBean testBean2(TestBean testBean3) {
+			try {
+				Thread.sleep(2000);
+			}
+			catch (InterruptedException ex) {
+				throw new RuntimeException(ex);
+			}
+			return new TestBean();
+		}
+
+		@Bean
+		public TestBean testBean3(TestBean testBean2) {
+			return new TestBean();
+		}
+	}
+
+
 	@Configuration(proxyBeanMethods = false)
 	static class CustomExecutorBeanConfig {