You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2013/06/12 23:15:21 UTC
svn commit: r1492430 -
/cxf/branches/2.7.x-fixes/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
Author: dkulp
Date: Wed Jun 12 21:15:20 2013
New Revision: 1492430
URL: http://svn.apache.org/r1492430
Log:
Merged revisions 1492425 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1492425 | dkulp | 2013-06-12 16:57:59 -0400 (Wed, 12 Jun 2013) | 2 lines
[CXF-5071] Make sure configs that set the SSLSocketFactory delegate down to URLConnection based impl
........
Modified:
cxf/branches/2.7.x-fixes/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
Modified: cxf/branches/2.7.x-fixes/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java?rev=1492430&r1=1492429&r2=1492430&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java (original)
+++ cxf/branches/2.7.x-fixes/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java Wed Jun 12 21:15:20 2013
@@ -152,6 +152,14 @@ public class AsyncHTTPConduit extends UR
}
}
+ if (uri.getScheme().equals("https")
+ && tlsClientParameters != null
+ && tlsClientParameters.getSSLSocketFactory() != null) {
+ //if they configured in an SSLSocketFactory, we cannot do anything
+ //with it as the NIO based transport cannot use socket created from
+ //the SSLSocketFactory.
+ o = false;
+ }
if (!MessageUtils.isTrue(o)) {
message.put(USE_ASYNC, Boolean.FALSE);
super.setupConnection(message, uri, csPolicy);
@@ -200,6 +208,7 @@ public class AsyncHTTPConduit extends UR
boolean needToCacheRequest,
boolean isChunking,
int chunkThreshold) throws IOException {
+
if (Boolean.TRUE.equals(message.get(USE_ASYNC))) {
CXFHttpRequest entity = message.get(CXFHttpRequest.class);
AsyncWrappedOutputStream out = new AsyncWrappedOutputStream(message,