svn commit: r996426 - in /cxf/trunk: rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java

[ff...@apache.org]

Author: ffang
Date: Mon Sep 13 06:04:56 2010
New Revision: 996426

URL: http://svn.apache.org/viewvc?rev=996426&view=rev
Log:
[CXF-2990]Response Context should not be empty even with a SOAP fault message when use async invoke

Modified:
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
    cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java?rev=996426&r1=996425&r2=996426&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java Mon Sep 13 06:04:56 2010
@@ -551,8 +551,11 @@ public class ClientImpl
                                    Exchange exchange,
                                    BindingOperationInfo oi,
                                    Map<String, Object> resContext) throws Exception {
-     // Check to see if there is a Fault from the outgoing chain
-        Exception ex = message.getContent(Exception.class);
+        Exception ex = null;
+        // Check to see if there is a Fault from the outgoing chain if it's an out Message
+        if (!message.get(Message.INBOUND_MESSAGE).equals(Boolean.TRUE)) {
+            ex = message.getContent(Exception.class);
+        }
         boolean mepCompleteCalled = false;
         if (ex != null) {
             getConduitSelector().complete(exchange);

Modified: cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java?rev=996426&r1=996425&r2=996426&view=diff
==============================================================================
--- cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java (original)
+++ cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java Mon Sep 13 06:04:56 2010
@@ -818,6 +818,8 @@ public class DispatchClientServerTest ex
 
         public void handleResponse(Response<Object> response) {
             try {
+                //response context shouldn't be empty even with fault response message
+                assertTrue(response.getContext().size() != 0);
                 reply = response.get();
             } catch (Exception e) {
                 //e.printStackTrace();