You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2010/11/15 16:47:11 UTC
svn commit: r1035318 - in /cxf/branches/2.2.x-fixes: ./
rt/core/src/main/java/org/apache/cxf/interceptor/
systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/
systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/resources/
Author: dkulp
Date: Mon Nov 15 15:47:11 2010
New Revision: 1035318
URL: http://svn.apache.org/viewvc?rev=1035318&view=rev
Log:
Merged revisions 1035304 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.3.x-fixes
................
r1035304 | dkulp | 2010-11-15 10:29:08 -0500 (Mon, 15 Nov 2010) | 9 lines
Merged revisions 1035203 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1035203 | ffang | 2010-11-15 05:12:28 -0500 (Mon, 15 Nov 2010) | 1 line
[CXF-3122]Async Handler for dispatch client is called twice in case of bad response message
........
................
Added:
cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerWithMalformedResponseTest.java
- copied unchanged from r1035304, cxf/branches/2.3.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerWithMalformedResponseTest.java
cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/MalformedResponseInterceptor.java
- copied unchanged from r1035304, cxf/branches/2.3.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/MalformedResponseInterceptor.java
cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/resources/GreetMeDocLiteralRespMalformed.xml
- copied unchanged from r1035304, cxf/branches/2.3.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/resources/GreetMeDocLiteralRespMalformed.xml
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/ClientOutFaultObserver.java
Propchange: cxf/branches/2.2.x-fixes/
('svn:mergeinfo' removed)
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/interceptor/ClientOutFaultObserver.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/ClientOutFaultObserver.java?rev=1035318&r1=1035317&r2=1035318&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/ClientOutFaultObserver.java (original)
+++ cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/ClientOutFaultObserver.java Mon Nov 15 15:47:11 2010
@@ -45,6 +45,10 @@ public class ClientOutFaultObserver exte
* override the super class method
*/
public void onMessage(Message m) {
+ if (m.get(Message.INBOUND_MESSAGE).equals(Boolean.TRUE)) {
+ //it's outbound fault observer so only take care of outbound fault
+ return;
+ }
Exception ex = m.getContent(Exception.class);
ClientCallback callback = m.getExchange().get(ClientCallback.class);