Author: markt
Date: Mon Jun 11 17:22:02 2018
New Revision: 1833343
URL: http://svn.apache.org/viewvc?rev=1833343&view=rev
Log:
Improve the handling of exceptions during TLS handshakes for the WebSocket
client.
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java?rev=1833343&r1=1833342&r2=1833343&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/AsyncChannelWrapperSecure.java
Mon Jun 11 17:22:02 2018
@@ -410,9 +410,9 @@ public class AsyncChannelWrapperSecure i
}
}
}
- } catch (SSLException | InterruptedException |
- ExecutionException e) {
+ } catch (Exception e) {
hFuture.fail(e);
+ return;
}
hFuture.complete(null);
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1833343&r1=1833342&r2=1833343&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Jun 11 17:22:02 2018
@@ -273,6 +273,10 @@
<code>DecodeException</code> instead of throwing
<code>ArrayIndexOutOfBoundsException</code>. (kfujino)
</fix>
+ <fix>
+ Improve the handling of exceptions during TLS handshakes for the
+ WebSocket client. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Web applications">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
