svn commit: r958843 - in /cxf/branches/2.2.x-fixes: ./ rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/ systests/uncategorized/src/test/java/org/apache/cxf/systes...

Mon, 28 Jun 2010 23:49:53 -0700 

Author: ema
Date: Tue Jun 29 06:48:21 2010
New Revision: 958843

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

........
  r958470 | ema | 2010-06-28 14:17:32 +0800 (Mon, 28 Jun 2010) | 1 line
  
  [CXF-2860]:Accepts the soap fault request message from another endpoint whose 
FaultTo address is this endpoint
........

Added:
    
cxf/branches/2.2.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/
      - copied from r958470, 
cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/
    
cxf/branches/2.2.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/LoggingHandler.java
      - copied unchanged from r958470, 
cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/LoggingHandler.java
    
cxf/branches/2.2.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/SOAPFaultImpl.java
      - copied unchanged from r958470, 
cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/SOAPFaultImpl.java
    
cxf/branches/2.2.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/SOAPFaultRequestTestCase.java
      - copied unchanged from r958470, 
cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/SOAPFaultRequestTestCase.java
    
cxf/branches/2.2.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/Server.java
      - copied unchanged from r958470, 
cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/Server.java
    
cxf/branches/2.2.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/handlers.xml
      - copied unchanged from r958470, 
cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/handlers.xml
    
cxf/branches/2.2.x-fixes/systests/uncategorized/src/test/resources/wsdl_systest/soap_fault.wsdl
      - copied unchanged from r958470, 
cxf/trunk/systests/uncategorized/src/test/resources/wsdl_systest/soap_fault.wsdl
Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    
cxf/branches/2.2.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/CheckFaultInterceptor.java
    
cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptor.java

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
    svn:mergeinfo = /cxf/trunk:958470

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

Modified: 
cxf/branches/2.2.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/CheckFaultInterceptor.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/CheckFaultInterceptor.java?rev=958843&r1=958842&r2=958843&view=diff
==============================================================================
--- 
cxf/branches/2.2.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/CheckFaultInterceptor.java
 (original)
+++ 
cxf/branches/2.2.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/CheckFaultInterceptor.java
 Tue Jun 29 06:48:21 2010
@@ -62,7 +62,7 @@ public class CheckFaultInterceptor exten
             throw new SoapFault(new Message("XML_STREAM_EXC", LOG), e, 
                                 message.getVersion().getSender());
         }
-        if (message.getVersion().getFault().equals(xmlReader.getName())) {
+        if (message.getVersion().getFault().equals(xmlReader.getName()) && 
isRequestor(message)) {
             Endpoint ep = message.getExchange().get(Endpoint.class);
             message.getInterceptorChain().abort();
             if (ep.getInFaultObserver() != null) {

Modified: 
cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptor.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptor.java?rev=958843&r1=958842&r2=958843&view=diff
==============================================================================
--- 
cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptor.java
 (original)
+++ 
cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptor.java
 Tue Jun 29 06:48:21 2010
@@ -277,7 +277,7 @@ public class SOAPHandlerInterceptor exte
                     }
                 }
             }
-            if (msg.getSOAPPart().getEnvelope().getBody() != null 
+            if (isRequestor(message) && 
msg.getSOAPPart().getEnvelope().getBody() != null 
                 && msg.getSOAPPart().getEnvelope().getBody().hasFault()) {
                 return null;
             }

Reply via email to