axis-java-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From veit...@apache.org
Subject svn commit: r1134709 - in /axis/axis2/java/core/branches/1_6: ./ modules/adb/src/org/apache/axis2/databinding/utils/MultirefHelper.java modules/kernel/src/org/apache/axis2/client/Stub.java
Date Sat, 11 Jun 2011 17:47:59 GMT
Author: veithen
Date: Sat Jun 11 17:47:59 2011
New Revision: 1134709

URL: http://svn.apache.org/viewvc?rev=1134709&view=rev
Log:
AXIS2-5071: Merged r1134438 to the 1.6 branch.

Modified:
    axis/axis2/java/core/branches/1_6/   (props changed)
    axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/utils/MultirefHelper.java
    axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/client/Stub.java

Propchange: axis/axis2/java/core/branches/1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jun 11 17:47:59 2011
@@ -1 +1 @@
-/axis/axis2/java/core/trunk:1070439,1072077,1072271,1072499,1072510,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085514,1087073,1088239,1088248-1088249,1088251,1088268,1091178,1091191,1099385,1099389,1100628,1101037,1103013,1103606,1103760,1128580,1128584,1128618,1128645,1130590,1131425,1134616
+/axis/axis2/java/core/trunk:1070439,1072077,1072271,1072499,1072510,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085514,1087073,1088239,1088248-1088249,1088251,1088268,1091178,1091191,1099385,1099389,1100628,1101037,1103013,1103606,1103760,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616

Modified: axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/utils/MultirefHelper.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/utils/MultirefHelper.java?rev=1134709&r1=1134708&r2=1134709&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/utils/MultirefHelper.java
(original)
+++ axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/utils/MultirefHelper.java
Sat Jun 11 17:47:59 2011
@@ -93,6 +93,7 @@ public class MultirefHelper {
                 while (itrChild.hasNext()) {
                     Object obj = itrChild.next();
                     if (obj instanceof OMNode) {
+                        itrChild.remove();
                         omElement.addChild((OMNode)obj);
                     }
                 }
@@ -245,7 +246,8 @@ public class MultirefHelper {
                     OMNode omNode = null;
                     for (Iterator iter = clonedReferenceElement.getChildren(); iter.hasNext();)
{
                         omNode = (OMNode) iter.next();
-                        elementToProcess.addChild(omNode.detach());
+                        iter.remove();
+                        elementToProcess.addChild(omNode);
                     }
 
                     // add attributes

Modified: axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/client/Stub.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/client/Stub.java?rev=1134709&r1=1134708&r2=1134709&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/client/Stub.java
(original)
+++ axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/client/Stub.java
Sat Jun 11 17:47:59 2011
@@ -212,6 +212,7 @@ public abstract class Stub {
         // add child elements
         for (Iterator iter = omElementToadd.getChildren(); iter.hasNext();){
              omNode = (OMNode) iter.next();
+             iter.remove();
              soapHeaderBlock.addChild(omNode);
         }
 



Mime
View raw message