Merge branch '1.5.x'

wilkinsona · wilkinsona · commit 33d04f0c91e6 · 2017-09-25T17:07:25.000+01:00
diff --git 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 void onApplicationEvent(SpringApplicationEvent event) {
 				performPreinitialization();
 			}
 		}
-		if (event instanceof ApplicationReadyEvent
-				|| event instanceof ApplicationFailedEvent) {
+		if ((event instanceof ApplicationReadyEvent
+				|| event instanceof ApplicationFailedEvent)
+				&& preinitializationStarted.get()) {
 			try {
 				preinitializationComplete.await();
 			}

Original file line number	Diff line number	Diff line change
`@@ -58,8 +58,9 @@ public void onApplicationEvent(SpringApplicationEvent event) {`
`58`	`58`	`performPreinitialization();`
`59`	`59`	`}`
`60`	`60`	`}`
`61`		`- if (event instanceof ApplicationReadyEvent`
`62`		`- \|\| event instanceof ApplicationFailedEvent) {`
	`61`	`+ if ((event instanceof ApplicationReadyEvent`
	`62`	`+ \|\| event instanceof ApplicationFailedEvent)`
	`63`	`+ && preinitializationStarted.get()) {`
`63`	`64`	`try {`
`64`	`65`	`preinitializationComplete.await();`
`65`	`66`	`}`