This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 81c6ff9301 Improve error handling
81c6ff9301 is described below
commit 81c6ff9301429d3ea7b9bfc5f479852d4a84363a
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jun 7 13:50:25 2023 +0100
Improve error handling
Should address recent intermittent CI failures for some WebSocket tests
(at least it does on my laptop that exhibited the same failures)
---
java/org/apache/tomcat/websocket/server/WsFrameServer.java | 3 ++-
webapps/docs/changelog.xml | 8 ++++++++
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/websocket/server/WsFrameServer.java
b/java/org/apache/tomcat/websocket/server/WsFrameServer.java
index fd4da3d44a..c0eb9e8b62 100644
--- a/java/org/apache/tomcat/websocket/server/WsFrameServer.java
+++ b/java/org/apache/tomcat/websocket/server/WsFrameServer.java
@@ -73,7 +73,8 @@ public class WsFrameServer extends WsFrameBase {
inputBuffer.position(inputBuffer.limit()).limit(inputBuffer.capacity());
int read = socketWrapper.read(false, inputBuffer);
inputBuffer.limit(inputBuffer.position()).reset();
- if (read < 0) {
+ // Some error conditions in NIO2 will trigger a return of zero and
close the socket
+ if (read < 0 || socketWrapper.isClosed()) {
throw new EOFException();
} else if (read == 0) {
return;
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5815df9289..0dbe05d39c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -114,6 +114,14 @@
</fix>
</changelog>
</subsection>
+ <subsection name="WebSocket">
+ <changelog>
+ <fix>
+ Improve handling of error conditions for the WebSocket server,
+ particularly during Tomcat shutdown. (markt)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 8.5.90 (schultz)" rtext="release in progress">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
