From 9eda564d063e347e7f937e61cd8c84819c670604 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 3 Nov 2023 09:57:12 +0000 Subject: [PATCH] Fix check for using CoordinatedRestoreAtCheckpointStartup Closes gh-38186 --- .../java/org/springframework/boot/SpringApplication.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java index c22c517224..857529e2aa 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java @@ -1684,8 +1684,10 @@ public class SpringApplication { } static Startup create() { - return (!ClassUtils.isPresent("jdk.crac.management.CRaCMXBean", Startup.class.getClassLoader())) - ? new StandardStartup() : new CoordinatedRestoreAtCheckpointStartup(); + ClassLoader classLoader = Startup.class.getClassLoader(); + return (ClassUtils.isPresent("jdk.crac.management.CRaCMXBean", classLoader) + && ClassUtils.isPresent("org.crac.management.CRaCMXBean", classLoader)) + ? new CoordinatedRestoreAtCheckpointStartup() : new StandardStartup(); } }