svn commit: r1149224 - in /axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj: SOAPBodyImpl.java SOAPFactoryImpl.java

[veithen]

Author: veithen
Date: Thu Jul 21 15:30:00 2011
New Revision: 1149224

URL: http://svn.apache.org/viewvc?rev=1149224&view=rev
Log:
Fixed a couple of instances where SAAJ depends on incorrect behavior of DOOM, 
in particular AXIOM-373.

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

Modified: 
axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPBodyImpl.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPBodyImpl.java?rev=1149224&r1=1149223&r2=1149224&view=diff
==============================================================================
--- 
axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPBodyImpl.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPBodyImpl.java
 Thu Jul 21 15:30:00 2011
@@ -178,7 +178,7 @@ public class SOAPBodyImpl extends SOAPEl
                                                                     prefix + 
":" + localName));
         }
         childEle.element.setUserData(SAAJ_NODE, childEle, null);
-        childEle.element.setNamespace(childEle.element.declareNamespace(uri, 
prefix));
+        childEle.element.setNamespace(getOMFactory().createOMNamespace(uri, 
prefix));
         element.appendChild(childEle.element);
         ((NodeImpl)childEle.element.getParentNode()).setUserData(SAAJ_NODE, 
this, null);
         isBodyElementAdded = true;
@@ -546,8 +546,7 @@ public class SOAPBodyImpl extends SOAPEl
                                                                             
qname.getLocalPart()));
         }
         childEle.element.setUserData(SAAJ_NODE, childEle, null);
-        childEle.element.setNamespace(childEle.element.declareNamespace(
-                qname.getNamespaceURI(), qname.getPrefix()));
+        
childEle.element.setNamespace(getOMFactory().createOMNamespace(qname.getNamespaceURI(),
 qname.getPrefix()));
 
         element.appendChild(childEle.element);
         ((NodeImpl)childEle.element.getParentNode()).setUserData(SAAJ_NODE, 
this, null);

Modified: 
axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPFactoryImpl.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPFactoryImpl.java?rev=1149224&r1=1149223&r2=1149224&view=diff
==============================================================================
--- 
axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPFactoryImpl.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPFactoryImpl.java
 Thu Jul 21 15:30:00 2011
@@ -226,8 +226,11 @@ public class SOAPFactoryImpl extends SOA
         } else {
             omdomFactory = 
(OMDOMFactory)DOOMAbstractFactory.getSOAP11Factory();
         }
-        OMNamespace ns = 
omdomFactory.createOMNamespace(element.getNamespaceURI()
-                , element.getPrefix());
+        String prefix = element.getPrefix();
+        if (prefix == null) {
+            prefix = "";
+        }
+        OMNamespace ns = 
omdomFactory.createOMNamespace(element.getNamespaceURI(), prefix);
         OMElement omElement = 
omdomFactory.createOMElement(element.getLocalName(), ns);
         return new SOAPElementImpl((ElementImpl)omElement);
     }