root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '1.5.x'

This commit is contained in:
Andy Wilkinson 2017-09-25 17:07:25 +01:00
parent dd5091f31a 616d11c00a
commit 33d04f0c91
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/BackgroundPreinitializer.java
View File

@ -58,8 +58,9 @@ public class BackgroundPreinitializer
performPreinitialization(); performPreinitialization();
} }
} }
if (event instanceof ApplicationReadyEvent if ((event instanceof ApplicationReadyEvent
|| event instanceof ApplicationFailedEvent) { || event instanceof ApplicationFailedEvent)
&& preinitializationStarted.get()) {
try { try {
preinitializationComplete.await(); preinitializationComplete.await();
} }