svn commit: r1227508 - in /cxf/branches/2.4.x-fixes: ./ rt/core/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainInitiatorObserver.java

[ema]

Author: ema
Date: Thu Jan  5 07:20:16 2012
New Revision: 1227508

URL: http://svn.apache.org/viewvc?rev=1227508&view=rev
Log:
Merged revisions 1227506 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1227506 | ema | 2012-01-05 15:14:48 +0800 (Thu, 05 Jan 2012) | 1 line
  
  [CXF-3981]:Does not store wsa header when wsrm is enabled to fix the 
SequenceTest 
........

Modified:
    cxf/branches/2.4.x-fixes/   (props changed)
    
cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainInitiatorObserver.java

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan  5 07:20:16 2012
@@ -1 +1 @@
-/cxf/trunk:1225217,1225494,1225521,1225538,1225563,1225876,1225880,1225895,1226521,1227029,1227488-1227494
+/cxf/trunk:1225217,1225494,1225521,1225538,1225563,1225876,1225880,1225895,1226521,1227029,1227488-1227494,1227506

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainInitiatorObserver.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainInitiatorObserver.java?rev=1227508&r1=1227507&r2=1227508&view=diff
==============================================================================
--- 
cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainInitiatorObserver.java
 (original)
+++ 
cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainInitiatorObserver.java
 Thu Jan  5 07:20:16 2012
@@ -85,7 +85,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"));
                 }