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

Merge branch '2.3.x' 

Closes gh-22581
This commit is contained in:
Andy Wilkinson 2020-07-27 11:30:34 +01:00
parent 3444a23765 d0c75aef19
commit 4827e84a12
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-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/BackgroundPreinitializer.java
View File

@ -23,9 +23,9 @@ import java.util.concurrent.atomic.AtomicBoolean;
import javax.validation.Configuration; import javax.validation.Configuration;
import javax.validation.Validation; import javax.validation.Validation;
import org.springframework.boot.context.event.ApplicationEnvironmentPreparedEvent;
import org.springframework.boot.context.event.ApplicationFailedEvent; import org.springframework.boot.context.event.ApplicationFailedEvent;
import org.springframework.boot.context.event.ApplicationReadyEvent; import org.springframework.boot.context.event.ApplicationReadyEvent;
import org.springframework.boot.context.event.ApplicationStartingEvent;
import org.springframework.boot.context.event.SpringApplicationEvent; import org.springframework.boot.context.event.SpringApplicationEvent;
import org.springframework.boot.context.logging.LoggingApplicationListener; import org.springframework.boot.context.logging.LoggingApplicationListener;
import org.springframework.context.ApplicationListener; import org.springframework.context.ApplicationListener;
@ -77,7 +77,8 @@ public class BackgroundPreinitializer implements ApplicationListener<SpringAppli
if (!ENABLED) { if (!ENABLED) {
return; return;
} }
if (event instanceof ApplicationStartingEvent && preinitializationStarted.compareAndSet(false, true)) { if (event instanceof ApplicationEnvironmentPreparedEvent
&& preinitializationStarted.compareAndSet(false, true)) {
performPreinitialization(); performPreinitialization();
} }
if ((event instanceof ApplicationReadyEvent || event instanceof ApplicationFailedEvent) if ((event instanceof ApplicationReadyEvent || event instanceof ApplicationFailedEvent)