[axis-axis2-java-core] 04/38: Merged r1150055 to the 1.5 branch to ensure compatibility with Axiom 1.2.13.

[billblough]

This is an automated email from the ASF dual-hosted git repository.

billblough pushed a commit to branch 1_5
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git

commit 1147e979bdc01b398ec1d7cda296b7e466ad6f0e
Author: Andreas Veithen <veit...@apache.org>
AuthorDate: Thu Sep 29 21:57:08 2011 +0000

    Merged r1150055 to the 1.5 branch to ensure compatibility with Axiom 1.2.13.
---
 .../src/org/apache/axis2/scripting/ScriptMessageContext.java   | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git 
a/modules/scripting/src/org/apache/axis2/scripting/ScriptMessageContext.java 
b/modules/scripting/src/org/apache/axis2/scripting/ScriptMessageContext.java
index 30c9d86..2e5a2f3 100644
--- a/modules/scripting/src/org/apache/axis2/scripting/ScriptMessageContext.java
+++ b/modules/scripting/src/org/apache/axis2/scripting/ScriptMessageContext.java
@@ -19,6 +19,9 @@
 
 package org.apache.axis2.scripting;
 
+import java.util.Iterator;
+
+import org.apache.axiom.soap.SOAPBody;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.scripting.convertors.OMElementConvertor;
@@ -59,7 +62,12 @@ public class ScriptMessageContext extends MessageContext {
      * @throws XMLStreamException
      */
     public void setPayloadXML(Object payload) {
-        
mc.getEnvelope().getBody().setFirstChild(convertor.fromScript(payload));
+        SOAPBody body = mc.getEnvelope().getBody();
+        for (Iterator it = body.getChildren(); it.hasNext(); ) {
+            it.next();
+            it.remove();
+        }
+        body.addChild(convertor.fromScript(payload));
     }
 
     /**