Repository: jclouds Updated Branches: refs/heads/cleanup-apachehc 1e484b683 -> 836167c91
Removing duplicate code Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/836167c9 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/836167c9 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/836167c9 Branch: refs/heads/cleanup-apachehc Commit: 836167c91933538623fb4b7507d82965d9c53e19 Parents: 1e484b6 Author: Andrew Phillips <[email protected]> Authored: Sat Oct 18 08:11:00 2014 -0400 Committer: Andrew Phillips <[email protected]> Committed: Sat Oct 18 08:11:00 2014 -0400 ---------------------------------------------------------------------- .../config/ApacheHCHttpCommandExecutorServiceModule.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/836167c9/drivers/apachehc/src/main/java/org/jclouds/http/apachehc/config/ApacheHCHttpCommandExecutorServiceModule.java ---------------------------------------------------------------------- diff --git a/drivers/apachehc/src/main/java/org/jclouds/http/apachehc/config/ApacheHCHttpCommandExecutorServiceModule.java b/drivers/apachehc/src/main/java/org/jclouds/http/apachehc/config/ApacheHCHttpCommandExecutorServiceModule.java index 79ef7ef..297c996 100644 --- a/drivers/apachehc/src/main/java/org/jclouds/http/apachehc/config/ApacheHCHttpCommandExecutorServiceModule.java +++ b/drivers/apachehc/src/main/java/org/jclouds/http/apachehc/config/ApacheHCHttpCommandExecutorServiceModule.java @@ -127,16 +127,11 @@ public class ApacheHCHttpCommandExecutorServiceModule extends AbstractModule { SchemeRegistry schemeRegistry = new SchemeRegistry(); Scheme http = new Scheme("http", PlainSocketFactory.getSocketFactory(), 80); - SSLSocketFactory sf = new SSLSocketFactory(context); + SSLSocketFactory sf = new SSLSocketFactory(context); sf.setHostnameVerifier(verifier); - Scheme https = new Scheme("https", sf, 443); - SchemeRegistry sr = new SchemeRegistry(); - sr.register(http); - sr.register(https); - schemeRegistry.register(new Scheme("http", PlainSocketFactory.getSocketFactory(), 80)); schemeRegistry.register(new Scheme("https", sf, 443)); final ClientConnectionManager cm = new ThreadSafeClientConnManager(params, schemeRegistry);
