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 2011/03/08 21:40:46 UTC
svn commit: r1079526 - in /cxf/branches/2.3.x-fixes: ./
api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/RetransmissionQueueTest.java
Author: dkulp
Date: Tue Mar 8 20:40:46 2011
New Revision: 1079526
URL: http://svn.apache.org/viewvc?rev=1079526&view=rev
Log:
Merged revisions 1079524 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1079524 | dkulp | 2011-03-08 15:39:33 -0500 (Tue, 08 Mar 2011) | 3 lines
[CXF-3381] Make sure retransmissions don't cause exceptions thrown to
the client.
Patch from Aki Yoshida applied
........
Added:
cxf/branches/2.3.x-fixes/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/RetransmissionQueueTest.java
- copied unchanged from r1079524, cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/RetransmissionQueueTest.java
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java?rev=1079526&r1=1079525&r2=1079526&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java (original)
+++ cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java Tue Mar 8 20:40:46 2011
@@ -292,7 +292,7 @@ public class PhaseInterceptorChain imple
if (ex2 == null) {
ex2 = ex;
}
-
+
FaultListener flogger = (FaultListener)
message.getContextualProperty(FaultListener.class.getName());
boolean useDefaultLogging = true;
@@ -302,12 +302,12 @@ public class PhaseInterceptorChain imple
if (useDefaultLogging) {
doDefaultLogging(message, ex2, description);
}
-
-
boolean isOneWay = false;
if (message.getExchange() != null) {
- message.getExchange().put(Exception.class, ex2);
+ if (message.getContent(Exception.class) != null) {
+ message.getExchange().put(Exception.class, ex2);
+ }
isOneWay = message.getExchange().isOneWay();
}