svn commit: r941166 - in /cxf/branches/2.2.x-fixes: ./ rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ rt/core/src/main/java/org/apache/cxf/endpoint/ rt/transports/http/src/main/java/org/apache/cxf/transport/http/

[dkulp]

Author: dkulp
Date: Wed May  5 06:36:00 2010
New Revision: 941166

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

........
  r941161 | dkulp | 2010-05-05 02:28:05 -0400 (Wed, 05 May 2010) | 1 line
  
  [CXF-2792] Fix test failure introduced earlier
........

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    
cxf/branches/2.2.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapOutInterceptor.java
    
cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
    
cxf/branches/2.2.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java

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

Modified: 
cxf/branches/2.2.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapOutInterceptor.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapOutInterceptor.java?rev=941166&r1=941165&r2=941166&view=diff
==============================================================================
--- 
cxf/branches/2.2.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapOutInterceptor.java
 (original)
+++ 
cxf/branches/2.2.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapOutInterceptor.java
 Wed May  5 06:36:00 2010
@@ -271,7 +271,6 @@ public class SoapOutInterceptor extends 
         }
 
         public void handleMessage(SoapMessage message) throws Fault {
-            SoapVersion soapVersion = message.getVersion();
             try {
                 XMLStreamWriter xtw = 
message.getContent(XMLStreamWriter.class);
                 if (xtw != null) {
@@ -283,6 +282,7 @@ public class SoapOutInterceptor extends 
                     xtw.flush();
                 }
             } catch (XMLStreamException e) {
+                SoapVersion soapVersion = message.getVersion();
                 throw new SoapFault(new 
org.apache.cxf.common.i18n.Message("XML_WRITE_EXC", BUNDLE), e,
                                     soapVersion.getSender());
             }

Modified: 
cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java?rev=941166&r1=941165&r2=941166&view=diff
==============================================================================
--- 
cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
 (original)
+++ 
cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
 Wed May  5 06:36:00 2010
@@ -70,6 +70,7 @@ import org.apache.cxf.service.model.Oper
 import org.apache.cxf.service.model.ServiceInfo;
 import org.apache.cxf.transport.Conduit;
 import org.apache.cxf.transport.MessageObserver;
+import org.apache.cxf.workqueue.SynchronousExecutor;
 import org.apache.cxf.wsdl11.WSDLServiceFactory;
 
 public class ClientImpl
@@ -943,7 +944,9 @@ public class ClientImpl
 
 
     public void setExecutor(Executor executor) {
-        this.executor = executor;
+        if (!SynchronousExecutor.isA(executor)) {
+            this.executor = executor;
+        }
     }
 
 

Modified: 
cxf/branches/2.2.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java?rev=941166&r1=941165&r2=941166&view=diff
==============================================================================
--- 
cxf/branches/2.2.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
 (original)
+++ 
cxf/branches/2.2.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
 Wed May  5 06:36:00 2010
@@ -2138,6 +2138,7 @@ public class HTTPConduit 
                         try {
                             handleResponseInternal();
                         } catch (Exception e) {
+                            
((PhaseInterceptorChain)outMessage.getInterceptorChain()).abort();
                             
((PhaseInterceptorChain)outMessage.getInterceptorChain()).unwind(outMessage);
                             outMessage.setContent(Exception.class, e);
                             
outMessage.getInterceptorChain().getFaultObserver().onMessage(outMessage);