Apache
/
httpcomponents-client
mirror of https://github.com/apache/httpcomponents-client.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HTTPCLIENT-2236: MultihomeIOSessionRequester fails to enhance the cause exception in case of connect failure if the remoteAddress argument has been given

This commit is contained in:
Oleg Kalnichevski 2022-09-30 16:34:51 +02:00
parent 07bed85ee5
commit 7ab435c271
1 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/MultihomeIOSessionRequester.java
View File

@ -66,19 +66,48 @@ final class MultihomeIOSessionRequester {
final Object attachment,
final FutureCallback<IOSession> callback) {
final ComplexFuture<IOSession> future = new ComplexFuture<>(callback);
if (remoteAddress != null) {
if (LOG.isDebugEnabled()) {
LOG.debug("{}:{} connecting {} to {} ({})",
remoteEndpoint.getHostName(), remoteEndpoint.getPort(), localAddress, remoteAddress, connectTimeout);
}
return connectionInitiator.connect(remoteEndpoint, remoteAddress, localAddress, connectTimeout, attachment, callback);
final Future<IOSession> sessionFuture = connectionInitiator.connect(remoteEndpoint, remoteAddress, localAddress, connectTimeout, attachment, new FutureCallback<IOSession>() {
@Override
public void completed(final IOSession session) {
future.completed(session);
}
@Override
public void failed(final Exception cause) {
if (LOG.isDebugEnabled()) {
LOG.debug("{}:{} connection to {} failed ({}); terminating operation",
remoteEndpoint.getHostName(), remoteEndpoint.getPort(), remoteAddress, cause.getClass());
}
if (cause instanceof IOException) {
future.failed(ConnectExceptionSupport.enhance((IOException) cause, remoteEndpoint,
(remoteAddress instanceof InetSocketAddress) ?
new InetAddress[] { ((InetSocketAddress) remoteAddress).getAddress() } :
new InetAddress[] {}));
} else {
future.failed(cause);
}
}
@Override
public void cancelled() {
future.cancel();
}
});
future.setDependency(sessionFuture);
return future;
}
if (LOG.isDebugEnabled()) {
LOG.debug("{} resolving remote address", remoteEndpoint.getHostName());
}
final ComplexFuture<IOSession> future = new ComplexFuture<>(callback);
final InetAddress[] remoteAddresses;
try {
remoteAddresses = dnsResolver.resolve(remoteEndpoint.getHostName());