another Xerces detection fix for JDK 17 (issue #541)

rbri · rbri · commit 343aa84458fc · 2023-01-21T09:45:43.000+01:00
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -8,6 +8,9 @@
 
     <body>
         <release version="2.70.0" date="xx, 2023" description="Chrome/Edge 109, Firefox 108, Bugfixes">
+            <action type="fix" dev="rbri" issue="541">"
+                Another Xerces detection fix for JDK 17.
+            </action>
             <action type="add" dev="rbri">
                 Missing properties addedNodes, removedNodes, previousSibling, and nextSibling added to MutationRecord.
             </action>
diff --git a/src/main/java/com/gargoylesoftware/htmlunit/platform/Platform.java b/src/main/java/com/gargoylesoftware/htmlunit/platform/Platform.java
@@ -51,7 +51,7 @@ public final class Platform {
             HelperSunXerces_ = (XmlUtilsHelperAPI)
                     Class.forName("com.gargoylesoftware.htmlunit.platform.util.XmlUtilsSunXercesHelper").newInstance();
         }
-        catch (final Exception e) {
+        catch (final Exception | LinkageError e) {
             // ignore
         }
 
@@ -60,7 +60,7 @@ public final class Platform {
             HelperXerces_ = (XmlUtilsHelperAPI)
                     Class.forName("com.gargoylesoftware.htmlunit.platform.util.XmlUtilsXercesHelper").newInstance();
         }
-        catch (final Exception e2) {
+        catch (final Exception | LinkageError e2) {
             // ignore
         }
     }
diff --git a/src/main/java/com/gargoylesoftware/htmlunit/platform/util/XmlUtilsSunXercesHelper.java b/src/main/java/com/gargoylesoftware/htmlunit/platform/util/XmlUtilsSunXercesHelper.java
@@ -18,6 +18,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
@@ -38,6 +39,11 @@ public final class XmlUtilsSunXercesHelper implements XmlUtilsHelperAPI {
 
     // private static final Log LOG = LogFactory.getLog(XmlUtilsXerces.class);
 
+    public XmlUtilsSunXercesHelper() {
+        // Force eager loading of classes in order to flush out any linkage errors early
+        Objects.hash(DeferredDocumentImpl.class, DeferredNode.class);
+    }
+
     /**
      * {@inheritDoc}
      */
diff --git a/src/main/java/com/gargoylesoftware/htmlunit/platform/util/XmlUtilsXercesHelper.java b/src/main/java/com/gargoylesoftware/htmlunit/platform/util/XmlUtilsXercesHelper.java
@@ -18,6 +18,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 import org.apache.xerces.dom.DeferredDocumentImpl;
 import org.apache.xerces.dom.DeferredNode;
@@ -38,6 +39,11 @@ public final class XmlUtilsXercesHelper implements XmlUtilsHelperAPI {
 
     // private static final Log LOG = LogFactory.getLog(XmlUtilsXerces.class);
 
+    public XmlUtilsXercesHelper() {
+        // Force eager loading of classes in order to flush out any linkage errors early
+        Objects.hash(DeferredDocumentImpl.class, DeferredNode.class);
+    }
+
     /**
      * {@inheritDoc}
      */

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public final class Platform {`
`51`	`51`	`HelperSunXerces_ = (XmlUtilsHelperAPI)`
`52`	`52`	`Class.forName("com.gargoylesoftware.htmlunit.platform.util.XmlUtilsSunXercesHelper").newInstance();`
`53`	`53`	`}`
`54`		`- catch (final Exception e) {`
	`54`	`+ catch (final Exception \| LinkageError e) {`
`55`	`55`	`// ignore`
`56`	`56`	`}`
`57`	`57`
`@@ -60,7 +60,7 @@ public final class Platform {`
`60`	`60`	`HelperXerces_ = (XmlUtilsHelperAPI)`
`61`	`61`	`Class.forName("com.gargoylesoftware.htmlunit.platform.util.XmlUtilsXercesHelper").newInstance();`
`62`	`62`	`}`
`63`		`- catch (final Exception e2) {`
	`63`	`+ catch (final Exception \| LinkageError e2) {`
`64`	`64`	`// ignore`
`65`	`65`	`}`
`66`	`66`	`}`