summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/trunk/modules/host-http/src/main/java/org/apache/tuscany/sca/host
diff options
context:
space:
mode:
authorrfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>2012-07-23 23:42:13 +0000
committerrfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>2012-07-23 23:42:13 +0000
commit691bd278f6f49b4bb0ec7457715b57793cdea663 (patch)
tree83163c2b43066334e2992e00117c723e5b43afc1 /sca-java-2.x/trunk/modules/host-http/src/main/java/org/apache/tuscany/sca/host
parent9454a826a6b61f6304e92fe2ca239a05ed1d274b (diff)
Upgrade http client version to handle https://issues.apache.org/jira/browse/HTTPCLIENT-1138
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1364844 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/trunk/modules/host-http/src/main/java/org/apache/tuscany/sca/host')
-rw-r--r--sca-java-2.x/trunk/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/client/HttpClientFactory.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/sca-java-2.x/trunk/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/client/HttpClientFactory.java b/sca-java-2.x/trunk/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/client/HttpClientFactory.java
index fe9fd49b56..8c9b1f3774 100644
--- a/sca-java-2.x/trunk/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/client/HttpClientFactory.java
+++ b/sca-java-2.x/trunk/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/client/HttpClientFactory.java
@@ -64,9 +64,10 @@ public class HttpClientFactory implements LifeCycleListener {
HttpConnectionParams.setConnectionTimeout(defaultParameters, 60000);
HttpConnectionParams.setSoTimeout(defaultParameters, 60000);
+ // See https://issues.apache.org/jira/browse/HTTPCLIENT-1138
SchemeRegistry supportedSchemes = new SchemeRegistry();
- supportedSchemes.register(new Scheme(HttpHost.DEFAULT_SCHEME_NAME, PlainSocketFactory.getSocketFactory(), 80));
- supportedSchemes.register(new Scheme("https", SSLSocketFactory.getSocketFactory(), 443));
+ supportedSchemes.register(new Scheme(HttpHost.DEFAULT_SCHEME_NAME, 80, PlainSocketFactory.getSocketFactory()));
+ supportedSchemes.register(new Scheme("https", 443, SSLSocketFactory.getSocketFactory()));
ClientConnectionManager connectionManager =
new ThreadSafeClientConnManager(defaultParameters, supportedSchemes);