You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by em...@apache.org on 2012/01/05 08:14:48 UTC

svn commit: r1227506 - /cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainInitiatorObserver.java

Author: ema
Date: Thu Jan  5 07:14:48 2012
New Revision: 1227506

URL: http://svn.apache.org/viewvc?rev=1227506&view=rev
Log:
[CXF-3981]:Does not store wsa header when wsrm is enabled to fix the SequenceTest 

Modified:
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainInitiatorObserver.java

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainInitiatorObserver.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainInitiatorObserver.java?rev=1227506&r1=1227505&r2=1227506&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainInitiatorObserver.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainInitiatorObserver.java Thu Jan  5 07:14:48 2012
@@ -87,7 +87,8 @@ public abstract class AbstractFaultChain
                     faultMessage.put(FaultMode.class, mode);
                 }
                 //CXF-3981
-                if (message.get("javax.xml.ws.addressing.context.inbound") != null) {
+                if (message.get("org.apache.cxf.ws.rm.inbound") == null 
+                    &&  message.get("javax.xml.ws.addressing.context.inbound") != null) {
                     faultMessage.put("javax.xml.ws.addressing.context.inbound",
                                      message.get("javax.xml.ws.addressing.context.inbound"));
                 }