svn commit: r1147485 - /axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java

[ve...@apache.org]

Author: veithen
Date: Sat Jul 16 20:25:12 2011
New Revision: 1147485

URL: http://svn.apache.org/viewvc?rev=1147485&view=rev
Log:
Fixed some incorrect namespace handling.

Modified:
    axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java

Modified: axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java?rev=1147485&r1=1147484&r2=1147485&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java (original)
+++ axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java Sat Jul 16 20:25:12 2011
@@ -175,7 +175,7 @@ public class SOAPElementImpl extends Nod
     */
     public SOAPElement addChildElement(String localName, String prefix, String uri)
             throws SOAPException {
-        OMNamespace omNamespace = element.declareNamespace(uri, prefix);
+        OMNamespace omNamespace = prefix == null || prefix.length() == 0 ? element.declareDefaultNamespace(uri) : element.declareNamespace(uri, prefix);
         return addChildElement(localName, omNamespace.getPrefix());
     }
 
@@ -194,7 +194,9 @@ public class SOAPElementImpl extends Nod
                         createElementNS(namespaceURI, prefix + ":" + localName));
 
         childEle.element.setUserData(SAAJ_NODE, childEle, null);
-        childEle.element.setNamespace(childEle.element.declareNamespace(namespaceURI, prefix));
+        childEle.element.setNamespace(prefix == null || prefix.length() == 0
+                ? childEle.element.declareDefaultNamespace(namespaceURI)
+                : childEle.element.declareNamespace(namespaceURI, prefix));
         element.appendChild(childEle.element);
         ((NodeImpl)childEle.element.getParentNode()).setUserData(SAAJ_NODE, this, null);
         childEle.setParentElement(this);