You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ay...@apache.org on 2013/02/14 17:28:28 UTC
svn commit: r1446269 - in /cxf/branches/2.6.x-fixes: ./
rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
Author: ay
Date: Thu Feb 14 16:28:28 2013
New Revision: 1446269
URL: http://svn.apache.org/r1446269
Log:
Merged revisions 1445832 via svn merge from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
........
r1445832 | dkulp | 2013-02-13 19:45:40 +0100 (Wed, 13 Feb 2013) | 9 lines
Merged revisions 1445768 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1445768 | ay | 2013-02-13 12:50:52 -0500 (Wed, 13 Feb 2013) | 2 lines
set exception before unwinding
........
........
Modified:
cxf/branches/2.6.x-fixes/ (props changed)
cxf/branches/2.6.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
Propchange: cxf/branches/2.6.x-fixes/
('svn:mergeinfo' removed)
Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.6.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java?rev=1446269&r1=1446268&r2=1446269&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java (original)
+++ cxf/branches/2.6.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java Thu Feb 14 16:28:28 2013
@@ -1537,8 +1537,8 @@ public class HTTPConduit
handleResponseInternal();
} catch (Exception e) {
((PhaseInterceptorChain)outMessage.getInterceptorChain()).abort();
- ((PhaseInterceptorChain)outMessage.getInterceptorChain()).unwind(outMessage);
outMessage.setContent(Exception.class, e);
+ ((PhaseInterceptorChain)outMessage.getInterceptorChain()).unwind(outMessage);
outMessage.getInterceptorChain().getFaultObserver().onMessage(outMessage);
}
}