Repository: marmotta Updated Branches: refs/heads/MARMOTTA-673-https_support_in_client_lib [created] 9e3b3a6d0
uncommented line for registering SSLConnectionSocketFactory with https Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/9e3b3a6d Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/9e3b3a6d Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/9e3b3a6d Branch: refs/heads/MARMOTTA-673-https_support_in_client_lib Commit: 9e3b3a6d073a87e20c9a41807ad093b360aeae4b Parents: b7f3989 Author: dglachs <dgla...@gmail.com> Authored: Tue Dec 12 08:58:02 2017 +0100 Committer: dglachs <dgla...@gmail.com> Committed: Tue Dec 12 08:58:02 2017 +0100 ---------------------------------------------------------------------- .../src/main/java/org/apache/marmotta/client/util/HTTPUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/9e3b3a6d/client/marmotta-client-java/src/main/java/org/apache/marmotta/client/util/HTTPUtil.java ---------------------------------------------------------------------- diff --git a/client/marmotta-client-java/src/main/java/org/apache/marmotta/client/util/HTTPUtil.java b/client/marmotta-client-java/src/main/java/org/apache/marmotta/client/util/HTTPUtil.java index d1aad13..5bb618e 100644 --- a/client/marmotta-client-java/src/main/java/org/apache/marmotta/client/util/HTTPUtil.java +++ b/client/marmotta-client-java/src/main/java/org/apache/marmotta/client/util/HTTPUtil.java @@ -30,6 +30,7 @@ import org.apache.http.config.Registry; import org.apache.http.config.RegistryBuilder; import org.apache.http.conn.socket.ConnectionSocketFactory; import org.apache.http.conn.socket.PlainConnectionSocketFactory; +import org.apache.http.conn.ssl.SSLConnectionSocketFactory; import org.apache.http.impl.client.*; import org.apache.http.impl.conn.PoolingHttpClientConnectionManager; import org.apache.http.protocol.HttpContext; @@ -74,7 +75,7 @@ public class HTTPUtil { } else { final Registry<ConnectionSocketFactory> registry = RegistryBuilder.<ConnectionSocketFactory>create() .register("http", PlainConnectionSocketFactory.getSocketFactory()) - //.register("https", ) + .register("https", SSLConnectionSocketFactory.getSocketFactory()) .build(); final PoolingHttpClientConnectionManager cm = new PoolingHttpClientConnectionManager(registry);
