svn commit: r1226951 - /shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpFetcher.java

[li...@apache.org]

Author: lindner
Date: Tue Jan  3 21:21:58 2012
New Revision: 1226951

URL: http://svn.apache.org/viewvc?rev=1226951&view=rev
Log:
Revert "fix deprecated usage for httpclient"

This reverts commit f30c4decb5332f18acbacacedd29dee7df54b12e.

Modified:
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpFetcher.java

Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpFetcher.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpFetcher.java?rev=1226951&r1=1226950&r2=1226951&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpFetcher.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpFetcher.java Tue Jan  3 21:21:58 2012
@@ -48,10 +48,8 @@ import org.apache.http.client.params.Cli
 import org.apache.http.client.params.HttpClientParams;
 import org.apache.http.client.protocol.RequestAddCookies;
 import org.apache.http.client.protocol.ResponseProcessCookies;
-import org.apache.http.conn.ClientConnectionManager;
 import org.apache.http.conn.ConnectionPoolTimeoutException;
 import org.apache.http.conn.HttpHostConnectException;
-import org.apache.http.conn.params.ConnManagerParams;
 import org.apache.http.conn.params.ConnPerRouteBean;
 import org.apache.http.conn.params.ConnRouteParams;
 import org.apache.http.conn.scheme.PlainSocketFactory;
@@ -152,11 +150,7 @@ public class BasicHttpFetcher implements
 
     HttpParams params = new BasicHttpParams();
 
-    ConnManagerParams.setTimeout(params, connectionTimeoutMs);
-
-    // These are probably overkill for most sites.
-    ConnManagerParams.setMaxTotalConnections(params, 1152);
-    ConnManagerParams.setMaxConnectionsPerRoute(params, new ConnPerRouteBean(256));
+    HttpConnectionParams.setConnectionTimeout(params, connectionTimeoutMs);
 
     HttpProtocolParams.setVersion(params, HttpVersion.HTTP_1_1);
     HttpProtocolParams.setUserAgent(params, "Apache Shindig");
@@ -172,10 +166,14 @@ public class BasicHttpFetcher implements
 
     // Create and initialize scheme registry
     SchemeRegistry schemeRegistry = new SchemeRegistry();
-    schemeRegistry.register(new Scheme("http", PlainSocketFactory.getSocketFactory(), 80));
-    schemeRegistry.register(new Scheme("https", SSLSocketFactory.getSocketFactory(), 443));
+    schemeRegistry.register(new Scheme("http", 80, PlainSocketFactory.getSocketFactory()));
+    schemeRegistry.register(new Scheme("https", 443, SSLSocketFactory.getSocketFactory()));
+
+    ThreadSafeClientConnManager cm = new ThreadSafeClientConnManager(schemeRegistry);
+    // These are probably overkill for most sites.
+    cm.setMaxTotal(1152);
+    cm.setDefaultMaxPerRoute(256);
 
-    ClientConnectionManager cm = new ThreadSafeClientConnManager(params, schemeRegistry);
     DefaultHttpClient client = new DefaultHttpClient(cm, params);
 
     // Set proxy if set via guice.