KEYCLOAK-14952 - Unit test failure in keycloak-saml-core on Java 11

tsaarni · Sep 14, 2020 · b62d68a · b62d68a
1 parent 3186f1b
commit b62d68a
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/saml-core/src/main/java/org/keycloak/saml/common/util/DocumentUtil.java b/saml-core/src/main/java/org/keycloak/saml/common/util/DocumentUtil.java
@@ -34,6 +34,7 @@
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.OutputKeys;
 import javax.xml.transform.Result;
 import javax.xml.transform.Source;
 import javax.xml.transform.Transformer;
@@ -304,6 +305,18 @@ public static InputStream getSourceAsStream(Source source) throws ConfigurationE
         Result streamResult = new StreamResult(baos);
         // Write the DOM document to the stream
         Transformer transformer = TransformerUtil.getTransformer();
+
+        if (DOMSource.class.isInstance(source)) {
+            Node node = ((DOMSource) source).getNode();
+            if (Document.class.isInstance(node)) {
+                String xmlEncoding = ((Document) node).getXmlEncoding();
+                if (xmlEncoding != null) {
+                    transformer.setOutputProperty(OutputKeys.ENCODING, xmlEncoding);
+                    transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "no");
+                }
+            }
+        }
+
         try {
             transformer.transform(source, streamResult);
         } catch (TransformerException e) {