Repository: camel Updated Branches: refs/heads/master 9c50fbac9 -> ce6c0a824
CAMEL-7314 Fixed the test error of camel-http4 with JDK8 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ce6c0a82 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ce6c0a82 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ce6c0a82 Branch: refs/heads/master Commit: ce6c0a8245202be6ad5a22e86659fc38acdce21a Parents: 9c50fba Author: Willem Jiang <willem.ji...@gmail.com> Authored: Thu May 15 11:14:36 2014 +0800 Committer: Willem Jiang <willem.ji...@gmail.com> Committed: Thu May 15 11:14:36 2014 +0800 ---------------------------------------------------------------------- .../java/org/apache/camel/component/http4/HttpComponent.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/ce6c0a82/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java index 58ebc11..bd65044 100644 --- a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java +++ b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java @@ -42,6 +42,7 @@ import org.apache.http.conn.socket.ConnectionSocketFactory; import org.apache.http.conn.socket.PlainConnectionSocketFactory; import org.apache.http.conn.ssl.BrowserCompatHostnameVerifier; import org.apache.http.conn.ssl.SSLConnectionSocketFactory; +import org.apache.http.conn.ssl.SSLContexts; import org.apache.http.conn.ssl.X509HostnameVerifier; import org.apache.http.impl.client.HttpClientBuilder; import org.apache.http.impl.conn.PoolingHttpClientConnectionManager; @@ -309,8 +310,8 @@ public class HttpComponent extends HeaderFilterStrategyComponent { builder.register("https", new SSLConnectionSocketFactory(sslContextParams.createSSLContext(), x509HostnameVerifier)); builder.register("https4", new SSLConnectionSocketFactory(sslContextParams.createSSLContext(), x509HostnameVerifier)); } else { - builder.register("https4", SSLConnectionSocketFactory.getSocketFactory()); - builder.register("https", SSLConnectionSocketFactory.getSocketFactory()); + builder.register("https4", new SSLConnectionSocketFactory(SSLContexts.createDefault(), x509HostnameVerifier)); + builder.register("https", new SSLConnectionSocketFactory(SSLContexts.createDefault(), x509HostnameVerifier)); } return builder.build(); }
