cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1445832 - /cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
Date Wed, 13 Feb 2013 18:45:40 GMT
Author: dkulp
Date: Wed Feb 13 18:45:40 2013
New Revision: 1445832

URL: http://svn.apache.org/r1445832
Log:
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.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java

Modified: cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java?rev=1445832&r1=1445831&r2=1445832&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
(original)
+++ cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
Wed Feb 13 18:45:40 2013
@@ -1123,8 +1123,8 @@ public abstract class HTTPConduit 
                         handleResponseInternal();
                     } catch (Throwable e) {
                         ((PhaseInterceptorChain)outMessage.getInterceptorChain()).abort();
-                        ((PhaseInterceptorChain)outMessage.getInterceptorChain()).unwind(outMessage);
                         outMessage.setContent(Exception.class, e);
+                        ((PhaseInterceptorChain)outMessage.getInterceptorChain()).unwind(outMessage);
                         MessageObserver mo = outMessage.getInterceptorChain().getFaultObserver();
                         if (mo == null) {
                             mo = outMessage.getExchange().get(MessageObserver.class);



Mime
View raw message