Skip to content

S
spring-boot
Commit 4827e84a authored by Andy Wilkinson's avatar Andy Wilkinson
Browse files
Options

Merge branch '2.3.x' 

Closes gh-22581
parents 3444a237 d0c75aef
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/BackgroundPreinitializer.java
View file @ 4827e84a
......@@ -23,9 +23,9 @@ import java.util.concurrent.atomic.AtomicBoolean;
import javax.validation.Configuration;
import javax.validation.Validation;
import org.springframework.boot.context.event.ApplicationEnvironmentPreparedEvent;
import org.springframework.boot.context.event.ApplicationFailedEvent;
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.logging.LoggingApplicationListener;
import org.springframework.context.ApplicationListener;
......@@ -77,7 +77,8 @@ public class BackgroundPreinitializer implements ApplicationListener<SpringAppli
if (!ENABLED) {
return;
}
if (event instanceof ApplicationStartingEvent && preinitializationStarted.compareAndSet(false, true)) {
if (event instanceof ApplicationEnvironmentPreparedEvent
&& preinitializationStarted.compareAndSet(false, true)) {
performPreinitialization();
}
if ((event instanceof ApplicationReadyEvent || event instanceof ApplicationFailedEvent)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment