Merge branch '6.2.x'

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

@@ -1099,11 +1099,10 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
 		List<String> beanNames = new ArrayList<>(this.beanDefinitionNames);
 
 		// Trigger initialization of all non-lazy singleton beans...
-		List<CompletableFuture<?>> futures = new ArrayList<>();
-
 		this.preInstantiationThread.set(PreInstantiation.MAIN);
 		this.mainThreadPrefix = getThreadNamePrefix();
 		try {
+			List<CompletableFuture<?>> futures = new ArrayList<>();
 			for (String beanName : beanNames) {
 				RootBeanDefinition mbd = getMergedLocalBeanDefinition(beanName);
 				if (!mbd.isAbstract() && mbd.isSingleton()) {
@@ -1113,12 +1112,6 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
 					}
 				}
 			}
-		}
-		finally {
-			this.mainThreadPrefix = null;
-			this.preInstantiationThread.remove();
-		}
-
 			if (!futures.isEmpty()) {
 				try {
 					CompletableFuture.allOf(futures.toArray(new CompletableFuture<?>[0])).join();
@@ -1127,6 +1120,11 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
 					ReflectionUtils.rethrowRuntimeException(ex.getCause());
 				}
 			}
+		}
+		finally {
+			this.mainThreadPrefix = null;
+			this.preInstantiationThread.remove();
+		}
 
 		// Trigger post-initialization callback for all applicable beans...
 		for (String beanName : beanNames) {