Merge branch '1.5.x'

2017-09-25 17:07:25 +01:00
parent dd5091f31a 616d11c00a
commit 33d04f0c91
1 changed files with 3 additions and 2 deletions
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/BackgroundPreinitializer.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/BackgroundPreinitializer.java
@@ -58,8 +58,9 @@ public class BackgroundPreinitializer
 				performPreinitialization();
 			}
 		}
-		if (event instanceof ApplicationReadyEvent
-				|| event instanceof ApplicationFailedEvent) {
+		if ((event instanceof ApplicationReadyEvent
+				|| event instanceof ApplicationFailedEvent)
+				&& preinitializationStarted.get()) {
 			try {
 				preinitializationComplete.await();
 			}