cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1492425 - /cxf/trunk/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
Date Wed, 12 Jun 2013 20:58:00 GMT
Author: dkulp
Date: Wed Jun 12 20:57:59 2013
New Revision: 1492425

URL: http://svn.apache.org/r1492425
Log:
[CXF-5071] Make sure configs that set the SSLSocketFactory delegate down to URLConnection
based impl

Modified:
    cxf/trunk/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java

Modified: cxf/trunk/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java?rev=1492425&r1=1492424&r2=1492425&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
(original)
+++ cxf/trunk/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
Wed Jun 12 20:57:59 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,



Mime
View raw message