svn commit: r1299831 - in /axis/axis2/java/sandesha/branches/1_6: ./ modules/core/src/main/java/org/apache/sandesha2/RMMsgContext.java

[veithen]

Author: veithen
Date: Mon Mar 12 20:26:42 2012
New Revision: 1299831

URL: http://svn.apache.org/viewvc?rev=1299831&view=rev
Log:
Merged r1187907 to the 1.6 branch.

Modified:
    axis/axis2/java/sandesha/branches/1_6/   (props changed)
    
axis/axis2/java/sandesha/branches/1_6/modules/core/src/main/java/org/apache/sandesha2/RMMsgContext.java

Propchange: axis/axis2/java/sandesha/branches/1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 12 20:26:42 2012
@@ -1 +1 @@
-/axis/axis2/java/sandesha/trunk:1072332-1072333,1081570,1090216,1098145,1137383,1145793,1186431,1212832,1214978,1220960,1221487,1241032
+/axis/axis2/java/sandesha/trunk:1072332-1072333,1081570,1090216,1098145,1137383,1145793,1186431,1187907,1212832,1214978,1220960,1221487,1241032

Modified: 
axis/axis2/java/sandesha/branches/1_6/modules/core/src/main/java/org/apache/sandesha2/RMMsgContext.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_6/modules/core/src/main/java/org/apache/sandesha2/RMMsgContext.java?rev=1299831&r1=1299830&r2=1299831&view=diff
==============================================================================
--- 
axis/axis2/java/sandesha/branches/1_6/modules/core/src/main/java/org/apache/sandesha2/RMMsgContext.java
 (original)
+++ 
axis/axis2/java/sandesha/branches/1_6/modules/core/src/main/java/org/apache/sandesha2/RMMsgContext.java
 Mon Mar 12 20:26:42 2012
@@ -125,7 +125,7 @@ public class RMMsgContext {
                                while(existingHeaders.hasNext()){
                                        OMElement oe = 
(OMElement)existingHeaders.next();
                                        
if(rmNamespaceValue.equals(oe.getNamespace().getNamespaceURI())){
-                                               oe.detach();
+                                               existingHeaders.remove();
                                        }
                                }
                        }