Author: sagara Date: Fri Mar 2 11:15:19 2012 New Revision: 1296143 URL: http://svn.apache.org/viewvc?rev=1296143&view=rev Log: Merged r1296062 to the 1.6 branch.
Modified: axis/axis2/java/core/branches/1_6/modules/saaj/ (props changed) axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPEnvelopeImpl.java Propchange: axis/axis2/java/core/branches/1_6/modules/saaj/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Fri Mar 2 11:15:19 2012 @@ -0,0 +1 @@ +/axis/axis2/java/core/trunk/modules/saaj: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,1096134,1096136,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,1147485,1149224,1149491,1149578,1150055,1153072,1154615,1156305,1156382,1157211,1157265,1157373,1157415,1157424,1157501,1157517,1157522,1157535,1157767,1162649,1163389,1166038,1166040,1166132,1167045,1174618,1184808,1184810,1184816,1185504,1190469,1190499,1195893,1195972,1195982,1198288,1201467,1201863,1201957,1202867,1203 424,1205716,1205939,1208901,1209034,1213180,1213639,1214118,1220630,1220888,1221716,1222510,1225161,1231465,1231470,1241031,1242238,1242249,1242511,1243831,1291158,1294991,1295084,1295479,1296062 Modified: axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPEnvelopeImpl.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPEnvelopeImpl.java?rev=1296143&r1=1296142&r2=1296143&view=diff ============================================================================== --- axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPEnvelopeImpl.java (original) +++ axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPEnvelopeImpl.java Fri Mar 2 11:15:19 2012 @@ -20,6 +20,7 @@ package org.apache.axis2.saaj; import org.apache.axiom.om.OMNode; +import org.apache.axiom.om.impl.dom.ChildNode; import org.apache.axiom.om.impl.dom.DocumentImpl; import org.apache.axiom.om.impl.dom.NodeImpl; import org.apache.axiom.om.impl.dom.TextImpl; @@ -201,7 +202,7 @@ public class SOAPEnvelopeImpl extends SO doomText.setNextOMSibling((OMNode)firstChild); doomText.setPreviousOMSibling(null); element.setFirstChild(doomText); - ((NodeImpl)firstChild).setPreviousOMSibling(doomText); + ((ChildNode)firstChild).setPreviousOMSibling(doomText); } return this; }