You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2012/03/12 21:47:36 UTC

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

Author: veithen
Date: Mon Mar 12 20:47:35 2012
New Revision: 1299847

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

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

Propchange: axis/axis2/java/sandesha/branches/1_4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 12 20:47:35 2012
@@ -1 +1 @@
-/axis/axis2/java/sandesha/trunk:1050214-1053350,1220960
+/axis/axis2/java/sandesha/trunk:1050214-1053350,1187907,1220960

Modified: axis/axis2/java/sandesha/branches/1_4/modules/core/src/main/java/org/apache/sandesha2/RMMsgContext.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_4/modules/core/src/main/java/org/apache/sandesha2/RMMsgContext.java?rev=1299847&r1=1299846&r2=1299847&view=diff
==============================================================================
--- axis/axis2/java/sandesha/branches/1_4/modules/core/src/main/java/org/apache/sandesha2/RMMsgContext.java (original)
+++ axis/axis2/java/sandesha/branches/1_4/modules/core/src/main/java/org/apache/sandesha2/RMMsgContext.java Mon Mar 12 20:47:35 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();
 					}
 				}
 			}