Fix #550

Author: cowtowncoder

release-notes/CREDITS-2.x

@@ -206,3 +206,10 @@ Eric Law (ericcwlaw@github)
 * Reported #498: `XmlMapper` fails to parse XML array when the array only has one level
  (2.14.0)
 
+David F. Elliott (dfelliott@github)
+
+* Reported #550: Use of `ClassLoader`-taking `newFactory()` variant breaks applications
+  using default JDK XML implementation
+ (2.14.0)
+
+

release-notes/VERSION-2.x

@@ -18,6 +18,9 @@ Project: jackson-dataformat-xml
 #545: `@JacksonXmlText` does not work when paired with `@JsonRawValue`
  (reported by James D)
  (fix contributed by Jonas K)
+#550: Use of `ClassLoader`-taking `newFactory()` variant breaks applications
+  using default JDK XML implementation
+ (reported by David-F E)
 
 2.13.5 (not yet released)
 

src/main/java/com/fasterxml/jackson/dataformat/xml/XmlFactory.java

@@ -120,18 +120,16 @@ protected XmlFactory(ObjectCodec oc, int xpFeatures, int xgFeatures,
         _xmlGeneratorFeatures = xgFeatures;
         _cfgNameForTextElement = nameForTextElem;
         if (xmlIn == null) {
-            // 05-Jul-2021, tatu: as per [dataformat-xml#483], specify ClassLoader
-            xmlIn = XMLInputFactory.newFactory(XMLInputFactory.class.getName(),
-                    getClass().getClassLoader());
+            xmlIn = StaxUtil.defaultInputFactory(getClass().getClassLoader());
             // as per [dataformat-xml#190], disable external entity expansion by default
             xmlIn.setProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES, Boolean.FALSE);
             // and ditto wrt [dataformat-xml#211], SUPPORT_DTD
             xmlIn.setProperty(XMLInputFactory.SUPPORT_DTD, Boolean.FALSE);
         }
         if (xmlOut == null) {
-            // 05-Jul-2021, tatu: as per [dataformat-xml#483], specify ClassLoader
-            xmlOut = XMLOutputFactory.newFactory(XMLOutputFactory.class.getName(),
-                    getClass().getClassLoader());
+            xmlOut = StaxUtil.defaultOutputFactory(getClass().getClassLoader());
+            // [dataformat-xml#326]: Better ensure namespaces get built properly:
+            xmlOut.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, Boolean.TRUE);
         }
         _initFactories(xmlIn, xmlOut);
         _xmlInputFactory = xmlIn;

src/main/java/com/fasterxml/jackson/dataformat/xml/XmlFactoryBuilder.java

@@ -6,6 +6,7 @@
 import com.fasterxml.jackson.core.TSFBuilder;
 import com.fasterxml.jackson.dataformat.xml.deser.FromXmlParser;
 import com.fasterxml.jackson.dataformat.xml.ser.ToXmlGenerator;
+import com.fasterxml.jackson.dataformat.xml.util.StaxUtil;
 
 /**
  * {@link com.fasterxml.jackson.core.TSFBuilder} implementation
@@ -109,10 +110,7 @@ public XMLInputFactory xmlInputFactory() {
     }
 
     protected XMLInputFactory defaultInputFactory() {
-        // 05-Jul-2021, tatu: as per [dataformat-xml#483], consider ClassLoader
-        XMLInputFactory xmlIn = XMLInputFactory.newFactory(XMLInputFactory.class.getName(),
-                staxClassLoader());
-
+        XMLInputFactory xmlIn = StaxUtil.defaultInputFactory(_classLoaderForStax);
         // as per [dataformat-xml#190], disable external entity expansion by default
         xmlIn.setProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES, Boolean.FALSE);
         // and ditto wrt [dataformat-xml#211], SUPPORT_DTD
@@ -128,9 +126,7 @@ public XMLOutputFactory xmlOutputFactory() {
     }
 
     protected XMLOutputFactory defaultOutputFactory() {
-        // 05-Jul-2021, tatu: as per [dataformat-xml#483], consider ClassLoader
-        XMLOutputFactory xmlOut = XMLOutputFactory.newFactory(XMLOutputFactory.class.getName(),
-                staxClassLoader());
+        XMLOutputFactory xmlOut = StaxUtil.defaultOutputFactory(_classLoaderForStax);
         // [dataformat-xml#326]: Better ensure namespaces get built properly:
         xmlOut.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, Boolean.TRUE);
         return xmlOut;

src/main/java/com/fasterxml/jackson/dataformat/xml/util/StaxUtil.java

@@ -135,6 +135,32 @@ public static org.codehaus.stax2.typed.Base64Variant toStax2Base64Variant(Base64
         return Base64Mapper.instance.map(j64b);
     }
 
+    /**
+     * @since 2.14
+     */
+    public static XMLInputFactory defaultInputFactory(ClassLoader cl) {
+        // 05-Jul-2021, tatu: as per [dataformat-xml#483], specify ClassLoader
+        try {
+            return XMLInputFactory.newFactory(XMLInputFactory.class.getName(), cl);
+        } catch (FactoryConfigurationError e) {
+            // 24-Oct-2022, tatu: as per [dataformat-xml#550] need extra care
+            return XMLInputFactory.newFactory();
+        }
+    }
+
+    /**
+     * @since 2.14
+     */
+    public static XMLOutputFactory defaultOutputFactory(ClassLoader cl) {
+        // 05-Jul-2021, tatu: as per [dataformat-xml#483], specify ClassLoader
+        try {
+            return XMLOutputFactory.newFactory(XMLOutputFactory.class.getName(), cl);
+        } catch (FactoryConfigurationError e) {
+            // 24-Oct-2022, tatu: as per [dataformat-xml#550] need extra care
+            return XMLOutputFactory.newFactory();
+        }
+    }
+
     private static class Base64Mapper {
         public final static Base64Mapper instance = new Base64Mapper();