Backported SWS-275 to 1.0 branch

Author: poutsma

core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapHeader.java

@@ -16,7 +16,9 @@
 
 package org.springframework.ws.soap.saaj;
 
+import java.util.ArrayList;
 import java.util.Iterator;
+import java.util.List;
 import javax.xml.namespace.QName;
 import javax.xml.soap.SOAPException;
 import javax.xml.soap.SOAPHeader;
@@ -42,12 +44,12 @@ abstract class SaajSoapHeader extends SaajSoapElement implements SoapHeader {
 
     public Iterator examineAllHeaderElements() throws SoapHeaderException {
         Iterator iterator = getImplementation().examineAllHeaderElements(getSaajHeader());
-        return new SaajSoapHeaderElementIterator(iterator);
+        return createSaajSoapHeaderElementIterator(iterator);
     }
 
     public Iterator examineMustUnderstandHeaderElements(String actorOrRole) throws SoapHeaderException {
         Iterator iterator = getImplementation().examineMustUnderstandHeaderElements(getSaajHeader(), actorOrRole);
-        return new SaajSoapHeaderElementIterator(iterator);
+        return createSaajSoapHeaderElementIterator(iterator);
     }
 
     public SoapHeaderElement addHeaderElement(QName name) throws SoapHeaderException {
@@ -68,6 +70,17 @@ public Result getResult() {
         return getImplementation().getResult(getSaajHeader());
     }
 
+    private Iterator createSaajSoapHeaderElementIterator(Iterator iterator) {
+        List result = new ArrayList();
+        while (iterator.hasNext()) {
+            Object o = iterator.next();
+            if (o instanceof SOAPHeaderElement) {
+                result.add(o);
+            }
+        }
+        return new SaajSoapHeaderElementIterator(result.iterator());
+    }
+
     protected static class SaajSoapHeaderElementIterator implements Iterator {
 
         private final Iterator iterator;

core/src/main/java/org/springframework/ws/soap/saaj/support/SaajXmlReader.java

@@ -22,14 +22,16 @@
 import javax.xml.soap.SOAPElement;
 import javax.xml.soap.Text;
 
-import org.springframework.xml.sax.AbstractXmlReader;
 import org.xml.sax.Attributes;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 import org.xml.sax.SAXNotRecognizedException;
 import org.xml.sax.SAXNotSupportedException;
 import org.xml.sax.helpers.AttributesImpl;
 
+import org.springframework.util.StringUtils;
+import org.springframework.xml.sax.AbstractXmlReader;
+
 /**
  * SAX <code>XMLReader</code> that reads from a SAAJ <code>Node</code>. Consumes <code>XMLEvents</code> from an
  * <code>XMLEventReader</code>, and calls the corresponding methods on the SAX callback interfaces.
@@ -176,9 +178,17 @@ private Attributes getAttributes(SOAPElement element) {
             for (Iterator iterator = element.getNamespacePrefixes(); iterator.hasNext();) {
                 String prefix = (String) iterator.next();
                 String namespaceUri = element.getNamespaceURI(prefix);
-                attributes.addAttribute("", "", "xmlns:" + prefix, "CDATA", namespaceUri);
+                String qName;
+                if (StringUtils.hasLength(prefix)) {
+                    qName = "xmlns:" + prefix;
+                }
+                else {
+                    qName = "xmlns";
+                }
+                attributes.addAttribute("", "", qName, "CDATA", namespaceUri);
             }
         }
+
         return attributes;
     }