Wait for lenient bean creation in non-locked threads as well

Closes gh-34349

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

@@ -303,12 +303,11 @@ public class DefaultSingletonBeanRegistry extends SimpleAliasRegistry implements
 					beforeSingletonCreation(beanName);
 				}
 				catch (BeanCurrentlyInCreationException ex) {
-					if (locked) {
 					this.lenientCreationLock.lock();
 					try {
 						while ((singletonObject = this.singletonObjects.get(beanName)) == null) {
 							if (!this.singletonsInLenientCreation.contains(beanName)) {
-									throw ex;
+								break;
 							}
 							try {
 								this.lenientCreationFinished.await();
@@ -317,11 +316,15 @@ public class DefaultSingletonBeanRegistry extends SimpleAliasRegistry implements
 								Thread.currentThread().interrupt();
 							}
 						}
-							return singletonObject;
 					}
 					finally {
 						this.lenientCreationLock.unlock();
 					}
+					if (singletonObject != null) {
+						return singletonObject;
+					}
+					if (locked) {
+						throw ex;
 					}
 					// Try late locking for waiting on specific bean to be finished.
 					this.singletonLock.lock();

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

@@ -102,6 +102,8 @@ class BackgroundBootstrapTests {
 
 		@Bean
 		public TestBean testBean1(ObjectProvider<TestBean> testBean3, ObjectProvider<TestBean> testBean4) {
+			new Thread(testBean3::getObject).start();
+			new Thread(testBean4::getObject).start();
 			new Thread(testBean3::getObject).start();
 			new Thread(testBean4::getObject).start();
 			try {