commit 7d523e911345a23b72e7557eb295578d56e1e6b3
author Oleg Kalnichevski <olegk@apache.org> Mon Sep 30 20:13:23 2019 +0200
committer Oleg Kalnichevski <olegk@apache.org> Fri Oct 04 14:45:56 2019 +0200
tree 12e72bbad95e992da2a63d364e04b1640cc3ec80
parent 90c07f34908883a0800589b78e194f6019daf403

Handle TLS session upgrade failures

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

diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/DefaultAsyncClientConnectionOperator.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/DefaultAsyncClientConnectionOperator.java
index 1d2a8e9..6d89f2a 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/DefaultAsyncClientConnectionOperator.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/DefaultAsyncClientConnectionOperator.java
@@ -90,13 +90,18 @@
                     public void completed(final IOSession session) {
                         final DefaultManagedAsyncClientConnection connection = new DefaultManagedAsyncClientConnection(session);
                         if (tlsStrategy != null) {
-                            tlsStrategy.upgrade(
-                                    connection,
-                                    host,
-                                    session.getLocalAddress(),
-                                    session.getRemoteAddress(),
-                                    attachment,
-                                    connectTimeout);
+                            try {
+                                tlsStrategy.upgrade(
+                                        connection,
+                                        host,
+                                        session.getLocalAddress(),
+                                        session.getRemoteAddress(),
+                                        attachment,
+                                        connectTimeout);
+                            } catch (final Exception ex) {
+                                future.failed(ex);
+                                return;
+                            }
                         }
                         future.completed(connection);
                     }