Author: veithen
Date: Thu Sep 29 21:53:04 2011
New Revision: 1177442
URL: http://svn.apache.org/viewvc?rev=1177442&view=rev
Log:
Merged r1150055 to the 1.6 branch to ensure compatibility with Axiom 1.2.13.
Modified:
axis/axis2/java/core/branches/1_6/ (props changed)
axis/axis2/java/core/branches/1_6/modules/scripting/src/org/apache/axis2/scripting/ScriptMessageContext.java
Propchange: axis/axis2/java/core/branches/1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 29 21:53:04 2011
@@ -1 +1 @@
-/axis/axis2/java/core/trunk:1068985,1069659,1069898,1070439,1072077,1072271,1072296,1072499,1072510,1075057,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085157,1085173,1085514,1085889,1085927,1085931,1087073,1088239,1088248-1088249,1088251,1088268,1088730,1088904,1089225,1089989,1090429,1090457,1091178,1091191,1094117,1096530,1096557,1099385,1099389,1100628,1101037,1103013,1103336,1103606,1103760,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1136177,1137153,1137159,1138144,1138203,1139448,1139484,1154615,1156305,1156382,1157211,1157265,1157373,1157415,1157424,1157501,1157517,1157522,1157535,1163389,1166038,1166040,1167045,1174618
+/axis/axis2/java/core/trunk:1068985,1069659,1069898,1070439,1072077,1072271,1072296,1072499,1072510,1075057,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085157,1085173,1085514,1085889,1085927,1085931,1087073,1088239,1088248-1088249,1088251,1088268,1088730,1088904,1089225,1089989,1090429,1090457,1091178,1091191,1094117,1096530,1096557,1099385,1099389,1100628,1101037,1103013,1103336,1103606,1103760,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1136177,1137153,1137159,1138144,1138203,1139448,1139484,1150055,1154615,1156305,1156382,1157211,1157265,1157373,1157415,1157424,1157501,1157517,1157522,1157535,1163389,1166038,1166040,1167045,1174618
Modified:
axis/axis2/java/core/branches/1_6/modules/scripting/src/org/apache/axis2/scripting/ScriptMessageContext.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/scripting/src/org/apache/axis2/scripting/ScriptMessageContext.java?rev=1177442&r1=1177441&r2=1177442&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_6/modules/scripting/src/org/apache/axis2/scripting/ScriptMessageContext.java
(original)
+++
axis/axis2/java/core/branches/1_6/modules/scripting/src/org/apache/axis2/scripting/ScriptMessageContext.java
Thu Sep 29 21:53:04 2011
@@ -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 extend
* @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));
}
/**
