Apache/httpcomponents-client
1
0
Fork 0
mirror of https://github.com/apache/httpcomponents-client.git synced 2025-02-09 11:35:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Classic exec runtime to establish connection automatically if the connection endpoint is disconnected

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1794169 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Oleg Kalnichevski 2017-05-06 18:30:02 +00:00
parent 196ee3363e
commit ecf4e93842
2 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ConnectExec.java
View File

@ -202,10 +202,6 @@ private boolean createTunnelToTarget(
this.proxyHttpProcessor.process(connect, null, context); this.proxyHttpProcessor.process(connect, null, context);
while (response == null) { while (response == null) {
if (!execRuntime.isConnected()) {
execRuntime.connect(context);
}
connect.removeHeaders(HttpHeaders.PROXY_AUTHORIZATION); connect.removeHeaders(HttpHeaders.PROXY_AUTHORIZATION);
this.authenticator.addAuthResponse(proxy, ChallengeType.PROXY, connect, proxyAuthExchange, context); this.authenticator.addAuthResponse(proxy, ChallengeType.PROXY, connect, proxyAuthExchange, context);

31
httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ExecRuntimeImpl.java
View File

@ -141,22 +141,26 @@ public boolean isConnected() {
return endpoint != null && endpoint.isConnected(); return endpoint != null && endpoint.isConnected();
} }
private void connectEndpoint(final ConnectionEndpoint endpoint, final HttpClientContext context) throws IOException {
if (cancellableAware != null) {
if (cancellableAware.isCancelled()) {
throw new RequestFailedException("Request aborted");
}
}
final RequestConfig requestConfig = context.getRequestConfig();
final TimeValue connectTimeout = requestConfig.getConnectTimeout();
manager.connect(endpoint, connectTimeout, context);
final TimeValue socketTimeout = requestConfig.getSocketTimeout();
if (socketTimeout.getDuration() >= 0) {
endpoint.setSocketTimeout(socketTimeout.toMillisIntBound());
}
}
@Override @Override
public void connect(final HttpClientContext context) throws IOException { public void connect(final HttpClientContext context) throws IOException {
final ConnectionEndpoint endpoint = ensureValid(); final ConnectionEndpoint endpoint = ensureValid();
if (!endpoint.isConnected()) { if (!endpoint.isConnected()) {
if (cancellableAware != null) { connectEndpoint(endpoint, context);
if (cancellableAware.isCancelled()) {
throw new RequestFailedException("Request aborted");
}
}
final RequestConfig requestConfig = context.getRequestConfig();
final TimeValue connectTimeout = requestConfig.getConnectTimeout();
manager.connect(endpoint, connectTimeout, context);
final TimeValue socketTimeout = requestConfig.getSocketTimeout();
if (socketTimeout.getDuration() >= 0) {
endpoint.setSocketTimeout(socketTimeout.toMillisIntBound());
}
} }
} }
@ -178,6 +182,9 @@ public void upgradeTls(final HttpClientContext context) throws IOException {
@Override @Override
public ClassicHttpResponse execute(final ClassicHttpRequest request, final HttpClientContext context) throws IOException, HttpException { public ClassicHttpResponse execute(final ClassicHttpRequest request, final HttpClientContext context) throws IOException, HttpException {
final ConnectionEndpoint endpoint = ensureValid(); final ConnectionEndpoint endpoint = ensureValid();
if (!endpoint.isConnected()) {
connectEndpoint(endpoint, context);
}
return endpoint.execute(request, requestExecutor, context); return endpoint.execute(request, requestExecutor, context);
} }