svn commit: r1004780 - in /cxf/branches/2.2.x-fixes: ./ api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java

[dkulp]

Author: dkulp
Date: Tue Oct  5 19:32:54 2010
New Revision: 1004780

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

........
  r1004738 | sergeyb | 2010-10-05 13:58:55 -0400 (Tue, 05 Oct 2010) | 1 line
  
  Updating PhaseInterceptorChain to unwind the chain before a oneway status is 
checked
........

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    
cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java

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

Modified: 
cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java?rev=1004780&r1=1004779&r2=1004780&view=diff
==============================================================================
--- 
cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
 (original)
+++ 
cxf/branches/2.2.x-fixes/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
 Tue Oct  5 19:32:54 2010
@@ -281,12 +281,14 @@ public class PhaseInterceptorChain imple
 
     
                         message.setContent(Exception.class, ex);
+                                            
+                        unwind(message);
+                        
                         boolean isOneWay = false;
                         if (message.getExchange() != null) {
                             message.getExchange().put(Exception.class, ex);
                             isOneWay = message.getExchange().isOneWay();
-                        }                    
-                        unwind(message);
+                        }
                         
                         if (faultObserver != null && !isOneWay) {
                             faultObserver.onMessage(message);