[GR-47473] Fix interfaces under which FlightRecorderMXBean is registe…

…red. PullRequest: graal/15514
oracle · Sep 14, 2023 · 5d904c8 · 5d904c8
2 parents 9cf893f + 5bc7444
commit 5d904c8
Showing 1 changed file with 15 additions and 7 deletions.
diff --git a/...evm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/management/ManagementSupport.java b/...evm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/management/ManagementSupport.java
@@ -104,20 +104,26 @@
  */
 public final class ManagementSupport implements ThreadListener {
 
-    private static final boolean isJdkManagementJfrModulePresent;
+    private static final Class<?> FLIGHT_RECORDER_MX_BEAN_CLASS;
 
     static {
-        var loggingModule = ModuleLayer.boot().findModule("jdk.management.jfr");
-        if (loggingModule.isPresent()) {
-            ManagementSupport.class.getModule().addReads(loggingModule.get());
+        var jfrModule = ModuleLayer.boot().findModule("jdk.management.jfr");
+        if (jfrModule.isPresent()) {
+            ManagementSupport.class.getModule().addReads(jfrModule.get());
+            try {
+                FLIGHT_RECORDER_MX_BEAN_CLASS = Class.forName("jdk.management.jfr.FlightRecorderMXBean", false, Object.class.getClassLoader());
+            } catch (ClassNotFoundException ex) {
+                throw VMError.shouldNotReachHere(ex);
+            }
+        } else {
+            FLIGHT_RECORDER_MX_BEAN_CLASS = null;
         }
-        isJdkManagementJfrModulePresent = loggingModule.isPresent();
     }
 
     static class JdkManagementJfrModulePresent implements BooleanSupplier {
         @Override
         public boolean getAsBoolean() {
-            return isJdkManagementJfrModulePresent;
+            return FLIGHT_RECORDER_MX_BEAN_CLASS != null;
         }
     }
 
@@ -166,7 +172,9 @@ public boolean getAsBoolean() {
          * run time.
          */
         doAddPlatformManagedObjectSingleton(getOsMXBeanInterface(), (PlatformManagedObjectSupplier) this::getOsMXBean);
-        doAddPlatformManagedObjectSingleton(PlatformManagedObject.class, (PlatformManagedObjectSupplier) this::getFlightRecorderMXBean);
+        if (FLIGHT_RECORDER_MX_BEAN_CLASS != null) {
+            doAddPlatformManagedObjectSingleton(FLIGHT_RECORDER_MX_BEAN_CLASS, (PlatformManagedObjectSupplier) this::getFlightRecorderMXBean);
+        }
     }
 
     private static Class<?> getOsMXBeanInterface() {