fix xerces detection

rbri · rbri · commit c1028b0bbf18 · 2022-12-30T12:25:07.000+01:00
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -7,6 +7,12 @@
     </properties>
 
     <body>
+        <release version="2.69.0" date="xx, 2023" description="Bugfixes">
+            <action type="fix" dev="rbri">
+                Xerces detection was broken.
+            </action>
+        </release>
+
         <release version="2.68.0" date="Dezember 28, 2022" description="Chrome/Edge 108, Firefox 108, Bugfixes, neko-html without xerces">
             <action type="fix" dev="rbri">
                 cssparser: typo when skipping a rule containing em values.
diff --git a/src/main/java/com/gargoylesoftware/htmlunit/platform/Platform.java b/src/main/java/com/gargoylesoftware/htmlunit/platform/Platform.java
@@ -39,6 +39,7 @@ public final class Platform {
 
     static {
         try {
+            Class.forName("com.sun.org.apache.xerces.internal.dom.DeferredDocumentImpl");
             HelperSunXerces_ = (XmlUtilsHelperAPI)
                     Class.forName("com.gargoylesoftware.htmlunit.platform.util.XmlUtilsSunXercesHelper").newInstance();
         }
@@ -47,6 +48,7 @@ public final class Platform {
         }
 
         try {
+            Class.forName("org.apache.xerces.dom.DeferredDocumentImpl");
             HelperXerces_ = (XmlUtilsHelperAPI)
                     Class.forName("com.gargoylesoftware.htmlunit.platform.util.XmlUtilsXercesHelper").newInstance();
         }
diff --git a/src/main/java/com/gargoylesoftware/htmlunit/platform/util/XmlUtilsSunXercesHelper.java b/src/main/java/com/gargoylesoftware/htmlunit/platform/util/XmlUtilsSunXercesHelper.java
@@ -19,13 +19,14 @@
 import java.util.List;
 import java.util.Map;
 
-import com.gargoylesoftware.htmlunit.platform.XmlUtilsHelperAPI;
-import com.sun.org.apache.xerces.internal.dom.DeferredDocumentImpl;
-import com.sun.org.apache.xerces.internal.dom.DeferredNode;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
+import com.gargoylesoftware.htmlunit.platform.XmlUtilsHelperAPI;
+import com.sun.org.apache.xerces.internal.dom.DeferredDocumentImpl;
+import com.sun.org.apache.xerces.internal.dom.DeferredNode;
+
 /**
  * <span style="color:red">INTERNAL API - SUBJECT TO CHANGE AT ANY TIME - USE AT YOUR OWN RISK.</span><br>
  *

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@ public final class Platform {`
`39`	`39`
`40`	`40`	`static {`
`41`	`41`	`try {`
	`42`	`+ Class.forName("com.sun.org.apache.xerces.internal.dom.DeferredDocumentImpl");`
`42`	`43`	`HelperSunXerces_ = (XmlUtilsHelperAPI)`
`43`	`44`	`Class.forName("com.gargoylesoftware.htmlunit.platform.util.XmlUtilsSunXercesHelper").newInstance();`
`44`	`45`	`}`
`@@ -47,6 +48,7 @@ public final class Platform {`
`47`	`48`	`}`
`48`	`49`
`49`	`50`	`try {`
	`51`	`+ Class.forName("org.apache.xerces.dom.DeferredDocumentImpl");`
`50`	`52`	`HelperXerces_ = (XmlUtilsHelperAPI)`
`51`	`53`	`Class.forName("com.gargoylesoftware.htmlunit.platform.util.XmlUtilsXercesHelper").newInstance();`
`52`	`54`	`}`