You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ni...@apache.org on 2013/10/28 16:04:45 UTC
svn commit: r1536377 -
/cxf/trunk/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduit.java
Author: ningjiang
Date: Mon Oct 28 15:04:45 2013
New Revision: 1536377
URL: http://svn.apache.org/r1536377
Log:
CXF-5333 Polish the code of NettyHttpConduit
Modified:
cxf/trunk/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduit.java
Modified: cxf/trunk/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduit.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduit.java?rev=1536377&r1=1536376&r2=1536377&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduit.java (original)
+++ cxf/trunk/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduit.java Mon Oct 28 15:04:45 2013
@@ -279,16 +279,21 @@ public class NettyHttpConduit extends UR
wrappedStream = cachedStream;
}
}
+
+ protected TLSClientParameters findTLSClientParameters() {
+ TLSClientParameters clientParameters = outMessage.get(TLSClientParameters.class);
+ if (clientParameters == null) {
+ clientParameters = getTlsClientParameters();
+ }
+ if (clientParameters == null) {
+ clientParameters = new TLSClientParameters();
+ }
+ return clientParameters;
+ }
protected void connect(boolean output) {
if (url.getScheme().equals("https")) {
- TLSClientParameters clientParameters = outMessage.get(TLSClientParameters.class);
- if (clientParameters == null) {
- clientParameters = getTlsClientParameters();
- }
- if (clientParameters == null) {
- clientParameters = new TLSClientParameters();
- }
+ TLSClientParameters clientParameters = findTLSClientParameters();
bootstrap.handler(new NettyHttpClientPipelineFactory(clientParameters));
} else {
bootstrap.handler(new NettyHttpClientPipelineFactory(null));
@@ -340,7 +345,7 @@ public class NettyHttpConduit extends UR
connect(true);
HostnameVerifier verifier = org.apache.cxf.transport.https.SSLUtils
- .getHostnameVerifier(tlsClientParameters);
+ .getHostnameVerifier(findTLSClientParameters());
if (!verifier.verify(url.getHost(), session)) {
throw new IOException("Could not verify host " + url.getHost());