[GR-62575] Eagerly initialize JdkCatalog#catalog before analysis

PullRequest: graal/20234

Author: zapster

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/xml/Target_jdk_xml_internal_JdkCatalog.java

@@ -24,18 +24,15 @@
  */
 package com.oracle.svm.core.jdk.xml;
 
-import java.time.Duration;
 import java.util.Objects;
 
-import com.oracle.svm.core.util.VMError;
 import org.graalvm.nativeimage.hosted.FieldValueTransformer;
 
 import com.oracle.svm.core.annotate.Alias;
 import com.oracle.svm.core.annotate.RecomputeFieldValue;
 import com.oracle.svm.core.annotate.Substitute;
 import com.oracle.svm.core.annotate.TargetClass;
 import com.oracle.svm.core.jdk.JDKLatest;
-import com.oracle.svm.util.ReflectionUtil;
 
 /**
  * Substitution to initialize {@link #catalog} at build time.
@@ -78,38 +75,13 @@ final class Target_javax_xml_parsers_SAXParser {
 
 final class JdkCatalogSupplier implements FieldValueTransformer {
 
-    private static Object catalog;
-
-    private static synchronized Object getCatalog() {
-        // Ensure the field is initialized.
-        Class<?> xmlSecurityManager = ReflectionUtil.lookupClass(false, "jdk.xml.internal.XMLSecurityManager");
-        // The constructor call prepareCatalog which will call JdkCatalog#init.
-        ReflectionUtil.newInstance(xmlSecurityManager);
-
-        try {
-            /*
-             * Workaround for race condition in XMLSecurityManager#prepareCatalog (JDK-8350189).
-             */
-            for (int retryCount = 0; catalog == null && retryCount < 3; retryCount++) {
-                Class<?> jdkCatalogClass = ReflectionUtil.lookupClass(false, "jdk.xml.internal.JdkCatalog");
-                Object res = ReflectionUtil.readStaticField(jdkCatalogClass, "catalog");
-                if (res == null) {
-                    Thread.sleep(Duration.ofMillis(100));
-                    continue;
-                }
-                catalog = res;
-            }
-        } catch (InterruptedException e) {
-            /* fall-through to the null check */
-        }
-        if (catalog == null) {
-            throw VMError.shouldNotReachHere("JdkCatalog initialization failed");
-        }
-        return catalog;
-    }
-
+    /**
+     * Verifies that {@link Target_jdk_xml_internal_JdkCatalog#catalog} is non-null. The
+     * initialization is triggered in
+     * {@code com.oracle.svm.hosted.xml.JavaxXmlClassAndResourcesLoaderFeature#initializeJdkCatalog()}
+     */
     @Override
     public Object transform(Object receiver, Object originalValue) {
-        return Objects.requireNonNull(getCatalog());
+        return Objects.requireNonNull(originalValue, "JdkCatalog initialization failed");
     }
 }

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/xml/JavaxXmlClassAndResourcesLoaderFeature.java

@@ -34,9 +34,14 @@
 import static com.oracle.svm.hosted.xml.XMLParsersRegistration.StAXParserClasses;
 import static com.oracle.svm.hosted.xml.XMLParsersRegistration.TransformerClassesAndResources;
 
+import org.graalvm.nativeimage.hosted.FieldValueTransformer;
+
+import com.oracle.svm.core.feature.AutomaticallyRegisteredFeature;
 import com.oracle.svm.core.feature.InternalFeature;
 import com.oracle.svm.core.jdk.JNIRegistrationUtil;
-import com.oracle.svm.core.feature.AutomaticallyRegisteredFeature;
+import com.oracle.svm.util.ReflectionUtil;
+
+import jdk.graal.compiler.serviceprovider.JavaVersionUtil;
 
 @AutomaticallyRegisteredFeature
 public class JavaxXmlClassAndResourcesLoaderFeature extends JNIRegistrationUtil implements InternalFeature {
@@ -66,5 +71,24 @@ public void beforeAnalysis(BeforeAnalysisAccess access) {
 
         access.registerReachabilityHandler(new BuiltinSchemaGrammarClasses()::registerConfigs,
                         constructor(access, "com.sun.org.apache.xerces.internal.impl.xs.SchemaGrammar$BuiltinSchemaGrammar", int.class, short.class));
+
+        initializeJdkCatalog();
+    }
+
+    /**
+     * Initialize the {@code JdkCatalog#catalog} field. We do this eagerly (instead of e.g. in a
+     * {@link FieldValueTransformer}) to work around a race condition in
+     * XMLSecurityManager#prepareCatalog (JDK-8350189).
+     */
+    private static void initializeJdkCatalog() {
+        if (JavaVersionUtil.JAVA_SPEC <= 21) {
+            return;
+        }
+        if (ModuleLayer.boot().findModule("java.xml").isPresent()) {
+            // Ensure the JdkCatalog#catalog field is initialized.
+            Class<?> xmlSecurityManager = ReflectionUtil.lookupClass(false, "jdk.xml.internal.XMLSecurityManager");
+            // The constructor call prepareCatalog which will call JdkCatalog#init.
+            ReflectionUtil.newInstance(xmlSecurityManager);
+        }
     }
 }