Author: ay
Date: Tue Sep 13 10:36:42 2011
New Revision: 1170107
URL: http://svn.apache.org/viewvc?rev=1170107&view=rev
Log:
Merged revisions 1170066 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1170066 | ay | 2011-09-13 09:35:29 +0200 (Tue, 13 Sep 2011) | 1 line
[CXF-3788] fixing interop issues caused by this earlier patch
........
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
cxf/branches/2.4.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
svn:mergeinfo = /cxf/trunk:1170066
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java?rev=1170107&r1=1170106&r2=1170107&view=diff
==============================================================================
---
cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
(original)
+++
cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
Tue Sep 13 10:36:42 2011
@@ -600,6 +600,18 @@ public class ClientImpl
}
throw ex;
}
+
+ //REVISIT
+ // - use a protocol neutral no-content marker instead of 202?
+ // - move the decoupled destination property name into api
+ Integer responseCode = (Integer)exchange.get(Message.RESPONSE_CODE);
+ if (null != responseCode && 202 == responseCode) {
+ Endpoint ep = exchange.getEndpoint();
+ if (null != ep && null != ep.getEndpointInfo() && null ==
ep.getEndpointInfo().
+
getProperty("org.apache.cxf.ws.addressing.MAPAggregator.decoupledDestination"))
{
+ return null;
+ }
+ }
// Wait for a response if we need to
if (oi != null && !oi.getOperationInfo().isOneWay()) {
Modified:
cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java?rev=1170107&r1=1170106&r2=1170107&view=diff
==============================================================================
---
cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
(original)
+++
cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
Tue Sep 13 10:36:42 2011
@@ -50,6 +50,8 @@ import org.apache.cxf.configuration.jsse
import org.apache.cxf.configuration.security.AuthorizationPolicy;
import org.apache.cxf.configuration.security.CertificateConstraintsType;
import org.apache.cxf.configuration.security.ProxyAuthorizationPolicy;
+import org.apache.cxf.endpoint.ClientCallback;
+import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.helpers.HttpHeaderHelper;
import org.apache.cxf.helpers.IOUtils;
import org.apache.cxf.helpers.LoadingByteArrayOutputStream;
@@ -1560,6 +1562,15 @@ public class HTTPConduit
// oneway operation or decoupled MEP without
// partial response
connection.getInputStream().close();
+ ClientCallback cc = exchange.get(ClientCallback.class);
+ if (null != cc) {
+ //REVISIT move the decoupled destination property name
into api
+ Endpoint ep = exchange.getEndpoint();
+ if (null != ep && null != ep.getEndpointInfo() && null
== ep.getEndpointInfo().
+
getProperty("org.apache.cxf.ws.addressing.MAPAggregator.decoupledDestination"))
{
+ cc.handleResponse(null, null);
+ }
+ }
return;
}
} else {
Modified:
cxf/branches/2.4.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java?rev=1170107&r1=1170106&r2=1170107&view=diff
==============================================================================
---
cxf/branches/2.4.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java
(original)
+++
cxf/branches/2.4.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java
Tue Sep 13 10:36:42 2011
@@ -74,7 +74,6 @@ import org.apache.hello_world_soap_http.
import org.apache.hello_world_soap_http.types.GreetMeLater;
import org.apache.hello_world_soap_http.types.GreetMeResponse;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Test;
@@ -223,8 +222,8 @@ public class DispatchClientServerTest ex
}
}
+
@Test
- @Ignore
public void testSOAPMessageInvokeToOneWay() throws Exception {
SOAPService service = new SOAPService(null, SERVICE_NAME);
service.addPort(PORT_NAME, SOAPBinding.SOAP11HTTP_BINDING,
@@ -244,8 +243,7 @@ public class DispatchClientServerTest ex
//Version 1:
//we'll just call invoke
- //disp.invoke(soapReqMsg1);
-
+ disp.invoke(soapReqMsg1);
//Version 2:
//We want to handle things asynchronously
