You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by co...@apache.org on 2016/11/21 11:24:01 UTC

svn commit: r1770650 - /santuario/xml-security-java/branches/2.0.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/Marshaller.java

Author: coheigea
Date: Mon Nov 21 11:24:01 2016
New Revision: 1770650

URL: http://svn.apache.org/viewvc?rev=1770650&view=rev
Log:
SANTUARIO-457 - Marshaller:sendAttributeToWriter broken by Attr without namespace.
 - Thanks to asolano for the patch.

Modified:
    santuario/xml-security-java/branches/2.0.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/Marshaller.java

Modified: santuario/xml-security-java/branches/2.0.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/Marshaller.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.0.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/Marshaller.java?rev=1770650&r1=1770649&r2=1770650&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.0.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/Marshaller.java (original)
+++ santuario/xml-security-java/branches/2.0.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/Marshaller.java Mon Nov 21 11:24:01 2016
@@ -334,8 +334,13 @@ class Marshaller {
                     attr.getLocalName(), attr.getTextContent());
         }
         else {
-            xwriter.writeAttribute(attr.getPrefix(), attr.getNamespaceURI(),
-                    attr.getLocalName(), attr.getTextContent());
+            if (attr.getNamespaceURI() == null && attr.getLocalName() == null) {
+                // Level 1 DOM attribute
+                xwriter.writeAttribute(null, null, attr.getName(), attr.getTextContent());
+            } else {
+                xwriter.writeAttribute(attr.getPrefix(), attr.getNamespaceURI(), attr.getLocalName(),
+                                       attr.getTextContent());
+            }
         }
     }