Merge pull request #33240 from sdeleuze

* gh-33240: Refine BackgroundPreinitializer code reachability Closes gh-33240
spring-projects · Nov 18, 2022 · 2f34346 · 2f34346
2 parents 517ec65 + e7f91ba
commit 2f34346
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/...figure/src/main/java/org/springframework/boot/autoconfigure/BackgroundPreinitializer.java b/...figure/src/main/java/org/springframework/boot/autoconfigure/BackgroundPreinitializer.java
@@ -64,12 +64,8 @@ public class BackgroundPreinitializer implements ApplicationListener<SpringAppli
 
 	private static final CountDownLatch preinitializationComplete = new CountDownLatch(1);
 
-	private static final boolean ENABLED;
-
-	static {
-		ENABLED = !Boolean.getBoolean(IGNORE_BACKGROUNDPREINITIALIZER_PROPERTY_NAME) && !NativeDetector.inNativeImage()
-				&& Runtime.getRuntime().availableProcessors() > 1;
-	}
+	private static final boolean ENABLED = !Boolean.getBoolean(IGNORE_BACKGROUNDPREINITIALIZER_PROPERTY_NAME)
+			&& Runtime.getRuntime().availableProcessors() > 1;
 
 	@Override
 	public int getOrder() {
@@ -78,7 +74,7 @@ public int getOrder() {
 
 	@Override
 	public void onApplicationEvent(SpringApplicationEvent event) {
-		if (!ENABLED) {
+		if (!ENABLED || NativeDetector.inNativeImage()) {
 			return;
 		}
 		if (event instanceof ApplicationEnvironmentPreparedEvent