Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Switch to BasicHttpClientConnectionManager instead of #32

Merged
merged 1 commit into from
Jan 25, 2014
Merged

Switch to BasicHttpClientConnectionManager instead of #32

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions modules/src/main/java/org/archive/modules/fetcher/FetchHTTPRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,9 @@
import org.apache.http.impl.client.BasicAuthCache;
import org.apache.http.impl.client.BasicCredentialsProvider;
import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.http.impl.conn.BasicHttpClientConnectionManager;
import org.apache.http.impl.conn.DefaultHttpResponseParserFactory;
import org.apache.http.impl.conn.ManagedHttpClientConnectionFactory;
import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
import org.apache.http.impl.io.DefaultHttpRequestWriterFactory;
import org.apache.http.io.HttpMessageParserFactory;
import org.apache.http.io.HttpMessageWriterFactory;
Expand Down Expand Up @@ -144,6 +144,8 @@ public InetAddress[] resolve(String host) throws UnknownHostException {
protected HttpHost targetHost;
protected boolean addedCredentials;
protected HttpHost proxyHost;
// make this a member variable so it doesn't get gc'd prematurely
protected HttpClientConnectionManager connMan;

public FetchHTTPRequest(FetchHTTP fetcher, CrawlURI curi) throws URIException {
this.fetcher = fetcher;
Expand Down Expand Up @@ -423,8 +425,8 @@ protected void configureHttpClientBuilder() {

httpClientBuilder.setDefaultCookieStore(fetcher.getCookieStore());

HttpClientConnectionManager connManager = buildConnectionManager();
httpClientBuilder.setConnectionManager(connManager);
connMan = buildConnectionManager();
httpClientBuilder.setConnectionManager(connMan);
}

protected HttpClientConnectionManager buildConnectionManager() {
Expand Down Expand Up @@ -464,11 +466,12 @@ public ManagedHttpClientConnection create(HttpRoute route,
DefaultHttpResponseParserFactory.INSTANCE);
}
};
PoolingHttpClientConnectionManager connMan = new PoolingHttpClientConnectionManager(socketFactoryRegistry, connFactory, dnsResolver);
BasicHttpClientConnectionManager connMan = new BasicHttpClientConnectionManager(
socketFactoryRegistry, connFactory, null, dnsResolver);

SocketConfig.Builder socketConfigBuilder = SocketConfig.custom();
socketConfigBuilder.setSoTimeout(fetcher.getSoTimeoutMs());
connMan.setDefaultSocketConfig(socketConfigBuilder.build());
connMan.setSocketConfig(socketConfigBuilder.build());

return connMan;
}
Expand Down