svn commit: r1135078 - in /axis/axis2/java/rampart/branches/1_6: ./ modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java

[veithen]

Author: veithen
Date: Mon Jun 13 10:28:18 2011
New Revision: 1135078

URL: http://svn.apache.org/viewvc?rev=1135078&view=rev
Log:
Merged r1134683 to the 1.6 branch to make sure that 1.6.1 will be compatible 
with Axiom 1.2.12 and to fix a potential issue related to a slightly modified 
iterator behavior in Axiom 1.2.11.

Modified:
    axis/axis2/java/rampart/branches/1_6/   (props changed)
    
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java

Propchange: axis/axis2/java/rampart/branches/1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 13 10:28:18 2011
@@ -1 +1 @@
-/axis/axis2/java/rampart/trunk:1072266-1072267,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075684,1083686,1129515,1129552,1130570,1131278,1132548,1132564,1134446
+/axis/axis2/java/rampart/trunk:1072266-1072267,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075684,1083686,1129515,1129552,1130570,1131278,1132548,1132564,1134446,1134683

Modified: 
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java?rev=1135078&r1=1135077&r2=1135078&view=diff
==============================================================================
--- 
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
 (original)
+++ 
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
 Mon Jun 13 10:28:18 2011
@@ -210,7 +210,7 @@ public class Axis2Util {
                                Iterator children = element.getChildren();
                                while (children.hasNext()) {
                                        OMNode child = (OMNode)children.next();
-                                       child.detach();
+                                       children.remove();
                                        header.addChild(child);
                                }