cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject svn commit: r996433 - in /cxf/branches/2.2.x-fixes: ./ rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java
Date Mon, 13 Sep 2010 06:31:01 GMT
Author: ffang
Date: Mon Sep 13 06:31:00 2010
New Revision: 996433

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

........
  r996426 | ffang | 2010-09-13 14:04:56 +0800 (δΈ€, 13  9 2010) | 1 line
  
  [CXF-2990]Response Context should not be empty even with a SOAP fault message when use async
invoke
........

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
    cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java

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

Modified: cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java?rev=996433&r1=996432&r2=996433&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
(original)
+++ cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
Mon Sep 13 06:31:00 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/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java?rev=996433&r1=996432&r2=996433&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java
(original)
+++ cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java
Mon Sep 13 06:31:00 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();



Mime
View raw message