[java-opensaml COMMIT] /trunk/opensaml-core/src/main/java/org/opensaml/core/xml/io/AbstractXMLObjectMarshaller.java

[noreply at shibboleth.net]

Author: putmanb
Date: Fri Jan 25 16:15:34 2013
New Revision: 3166

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3166&view=rev
Log:
OSJ-36: Marshalling/serialization is producing a namespace declaration on every element.
Add some trace logging.

Modified:
    trunk/opensaml-core/src/main/java/org/opensaml/core/xml/io/AbstractXMLObjectMarshaller.java

Modified: trunk/opensaml-core/src/main/java/org/opensaml/core/xml/io/AbstractXMLObjectMarshaller.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-core/src/main/java/org/opensaml/core/xml/io/AbstractXMLObjectMarshaller.java?rev=3166&r1=3165&r2=3166&view=diff
==============================================================================
--- trunk/opensaml-core/src/main/java/org/opensaml/core/xml/io/AbstractXMLObjectMarshaller.java (original)
+++ trunk/opensaml-core/src/main/java/org/opensaml/core/xml/io/AbstractXMLObjectMarshaller.java Fri Jan 25 16:15:34 2013
@@ -288,15 +288,19 @@
         Set<Namespace> namespaces = xmlObject.getNamespaces();
 
         for (Namespace namespace : namespaces) {
+            log.trace("Candiate namespace from getNamespaces(): {}", namespace.toString());
             if (!xmlObject.getNamespaceManager().getNamespaceDeclarations().contains(namespace)) {
+                log.trace("NamespaceManager getNamespaceDeclarations() did NOT contain namespace: {}",
+                        namespace.toString());
                 if(Objects.equal(namespace.getNamespacePrefix(), XmlConstants.XML_PREFIX)
                         || Objects.equal(namespace.getNamespaceURI(), XmlConstants.XML_NS)) {
                     //the "xml" namespace never needs to be declared
                     continue;
                 }
                 
-                String declared = NamespaceSupport.lookupNamespaceURI(domElement, domElement, 
+                String declared = NamespaceSupport.lookupNamespaceURI(domElement, null, 
                         namespace.getNamespacePrefix());
+                log.trace("Lookup of prefix '{}' returned '{}'", namespace.getNamespacePrefix(),  declared);
                 if (declared != null && namespace.getNamespaceURI().equals(declared)) {
                     log.trace("Namespace {} has already been declared on an ancestor of {} no need to add it here", 
                             namespace, xmlObject.getElementQName());