You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by an...@apache.org on 2014/10/20 21:19:12 UTC
git commit: Additional cleanup
Repository: jclouds
Updated Branches:
refs/heads/cleanup-apachehc 836167c91 -> feecd3853
Additional cleanup
Missed some unused code there. Thanks, @jdaggett!
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/feecd385
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/feecd385
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/feecd385
Branch: refs/heads/cleanup-apachehc
Commit: feecd3853a9bec4e77820554ae3d9a07df30bb03
Parents: 836167c
Author: Andrew Phillips <an...@apache.org>
Authored: Mon Oct 20 15:18:16 2014 -0400
Committer: Andrew Phillips <an...@apache.org>
Committed: Mon Oct 20 15:18:16 2014 -0400
----------------------------------------------------------------------
.../config/ApacheHCHttpCommandExecutorServiceModule.java | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/feecd385/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 297c996..c568508 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
@@ -125,15 +125,12 @@ public class ApacheHCHttpCommandExecutorServiceModule extends AbstractModule {
SSLContext context, Closer closer) throws NoSuchAlgorithmException, KeyManagementException {
SchemeRegistry schemeRegistry = new SchemeRegistry();
-
- Scheme http = new Scheme("http", PlainSocketFactory.getSocketFactory(), 80);
+ schemeRegistry.register(new Scheme("http", PlainSocketFactory.getSocketFactory(), 80));
SSLSocketFactory sf = new SSLSocketFactory(context);
sf.setHostnameVerifier(verifier);
- Scheme https = new Scheme("https", sf, 443);
-
- schemeRegistry.register(new Scheme("http", PlainSocketFactory.getSocketFactory(), 80));
schemeRegistry.register(new Scheme("https", sf, 443));
+
final ClientConnectionManager cm = new ThreadSafeClientConnManager(params, schemeRegistry);
closer.addToClose(new Closeable() {
@Override