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

[veithen]

Author: veithen
Date: Mon Jun 13 10:36:30 2011
New Revision: 1135080

URL: http://svn.apache.org/viewvc?rev=1135080&view=rev
Log:
Merged r1134683 to the 1.5 branch to ensure compatibility with Axiom 1.2.12 and 
to fix a potential issue related to a slightly modified iterator behavior when 
using Axiom 1.2.11.

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

Propchange: axis/axis2/java/rampart/branches/1_5_x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 13 10:36:30 2011
@@ -1 +1 @@
-/axis/axis2/java/rampart/trunk:1072187,1083686
+/axis/axis2/java/rampart/trunk:1072187,1083686,1134683

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