Connection managers to unwrap DeadlineTimeoutException from ExecutionException and propagate it to the caller

Author: ok2c

httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/PoolingHttpClientConnectionManager.java

@@ -84,6 +84,7 @@
 import org.apache.hc.core5.pool.StrictConnPool;
 import org.apache.hc.core5.util.Args;
 import org.apache.hc.core5.util.Deadline;
+import org.apache.hc.core5.util.DeadlineTimeoutException;
 import org.apache.hc.core5.util.Identifiable;
 import org.apache.hc.core5.util.TimeValue;
 import org.apache.hc.core5.util.Timeout;
@@ -388,6 +389,12 @@ public ConnectionEndpoint get(
                     final PoolEntry<HttpRoute, ManagedHttpClientConnection> poolEntry;
                     try {
                         poolEntry = leaseFuture.get(timeout.getDuration(), timeout.getTimeUnit());
+                    } catch (final ExecutionException ex) {
+                        leaseFuture.cancel(true);
+                        if (ex.getCause() instanceof DeadlineTimeoutException) {
+                            throw (DeadlineTimeoutException) ex.getCause();
+                        }
+                        throw ex;
                     } catch (final TimeoutException ex) {
                         leaseFuture.cancel(true);
                         throw ex;

httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/PoolingAsyncClientConnectionManager.java

@@ -95,6 +95,7 @@
 import org.apache.hc.core5.reactor.ssl.TlsDetails;
 import org.apache.hc.core5.util.Args;
 import org.apache.hc.core5.util.Deadline;
+import org.apache.hc.core5.util.DeadlineTimeoutException;
 import org.apache.hc.core5.util.Identifiable;
 import org.apache.hc.core5.util.TimeValue;
 import org.apache.hc.core5.util.Timeout;
@@ -401,7 +402,18 @@ public AsyncConnectionEndpoint get() throws InterruptedException, ExecutionExcep
             @Override
             public AsyncConnectionEndpoint get(
                     final long timeout, final TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException {
-                return resultFuture.get(timeout, unit);
+                try {
+                    return resultFuture.get(timeout, unit);
+                } catch (final ExecutionException ex) {
+                    leaseFuture.cancel(true);
+                    if (ex.getCause() instanceof DeadlineTimeoutException) {
+                        throw (DeadlineTimeoutException) ex.getCause();
+                    }
+                    throw ex;
+                } catch (final TimeoutException ex) {
+                    leaseFuture.cancel(true);
+                    throw ex;
+                }
             }
 
             @Override