boxtec
/
yacy_search_server
mirror of https://github.com/yacy/yacy_search_server
4
1
Fork 0
Code Issues Projects Releases Wiki Activity

uses clientBuilder not HttpClients.custom() to have these inside the

Browse Source 
Pool too
pull/436/head
sgaebel 3 years ago
parent cdf901270c
commit 4bf6954474
1 changed files with 20 additions and 25 deletions
Show Stats Download Patch File Download Diff File

45
source/net/yacy/cora/protocol/http/HTTPClient.java
Unescape View File

@ -93,7 +93,6 @@ import org.apache.http.impl.client.BasicCredentialsProvider;
import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.DefaultConnectionKeepAliveStrategy; import org.apache.http.impl.client.DefaultConnectionKeepAliveStrategy;
import org.apache.http.impl.client.HttpClientBuilder; import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.impl.client.IdleConnectionEvictor; import org.apache.http.impl.client.IdleConnectionEvictor;
import org.apache.http.impl.conn.PoolingHttpClientConnectionManager; import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
import org.apache.http.protocol.HTTP; import org.apache.http.protocol.HTTP;
@ -452,25 +451,23 @@ public class HTTPClient implements Closeable {
new AuthScope("localhost", url.getPort()), new AuthScope("localhost", url.getPort()),
new UsernamePasswordCredentials(username, pass)); new UsernamePasswordCredentials(username, pass));
try (final CloseableHttpClient httpclient = HttpClients.custom().setDefaultCredentialsProvider(credsProvider) try (final CloseableHttpClient httpclient = clientBuilder.setDefaultCredentialsProvider(credsProvider)
.setDefaultAuthSchemeRegistry(AUTHSCHEMEREGISTRY).build()) { .setDefaultAuthSchemeRegistry(AUTHSCHEMEREGISTRY).build()) {
this.httpResponse = httpclient.execute(this.currentRequest); this.httpResponse = httpclient.execute(this.currentRequest);
try { HttpEntity httpEntity = this.httpResponse.getEntity();
HttpEntity httpEntity = this.httpResponse.getEntity(); if (httpEntity != null) {
if (httpEntity != null) { if (getStatusCode() == HttpStatus.SC_OK) {
if (getStatusCode() == HttpStatus.SC_OK) { if (maxBytes >= 0 && httpEntity.getContentLength() > maxBytes) {
if (maxBytes >= 0 && httpEntity.getContentLength() > maxBytes) { /* When anticipated content length is already known and exceed the specified limit :
/* When anticipated content length is already known and exceed the specified limit : * throw an exception and abort the connection, consistently with getByteArray() implementation
* throw an exception and abort the connection, consistently with getByteArray() implementation * Otherwise returning null and consuming fully the entity can be very long on large resources */
* Otherwise returning null and consuming fully the entity can be very long on large resources */ throw new IOException("Content to download exceed maximum value of " + Formatter.bytesToString(maxBytes));
throw new IOException("Content to download exceed maximum value of " + Formatter.bytesToString(maxBytes)); }
} return getByteArray(httpEntity, maxBytes);
return getByteArray(httpEntity, maxBytes);
}
} }
} finally {
close();
} }
} finally {
close();
} }
return null; return null;
} }
@ -642,19 +639,17 @@ public class HTTPClient implements Closeable {
new AuthScope("localhost", url.getPort()), new AuthScope("localhost", url.getPort()),
new UsernamePasswordCredentials(userName, password)); new UsernamePasswordCredentials(userName, password));
try (final CloseableHttpClient httpclient = HttpClients.custom().setDefaultCredentialsProvider(credsProvider) try (final CloseableHttpClient httpclient = clientBuilder.setDefaultCredentialsProvider(credsProvider)
.setDefaultAuthSchemeRegistry(AUTHSCHEMEREGISTRY).build()) { .setDefaultAuthSchemeRegistry(AUTHSCHEMEREGISTRY).build()) {
this.httpResponse = httpclient.execute(this.currentRequest); this.httpResponse = httpclient.execute(this.currentRequest);
try { HttpEntity httpEntity = this.httpResponse.getEntity();
HttpEntity httpEntity = this.httpResponse.getEntity(); if (httpEntity != null) {
if (httpEntity != null) { if (getStatusCode() == HttpStatus.SC_OK) {
if (getStatusCode() == HttpStatus.SC_OK) { return getByteArray(httpEntity, Integer.MAX_VALUE);
return getByteArray(httpEntity, Integer.MAX_VALUE);
}
} }
} finally {
close();
} }
} finally {
close();
} }
return null; return null;
} }

Write Preview
Loading…
Cancel
Save