[tomcat] 02/02: Fix regression in fix for BZ 66574

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 3a4397e30145156cb99162d7ce7936e2187d0d66
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Jun 16 14:50:28 2023 +0100

    Fix regression in fix for BZ 66574
    
    WebSocket session should report open until after the onClose event has
    completed.
---
 java/org/apache/tomcat/websocket/WsSession.java | 2 +-
 webapps/docs/changelog.xml                      | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/tomcat/websocket/WsSession.java 
b/java/org/apache/tomcat/websocket/WsSession.java
index fc498b200f..0c75f92184 100644
--- a/java/org/apache/tomcat/websocket/WsSession.java
+++ b/java/org/apache/tomcat/websocket/WsSession.java
@@ -459,7 +459,7 @@ public class WsSession implements Session {
 
     @Override
     public boolean isOpen() {
-        return state.get() == State.OPEN;
+        return state.get() == State.OPEN || state.get() == 
State.OUTPUT_CLOSING;
     }
 
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 805fbe2a84..932e42fa10 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -141,6 +141,11 @@
         Improve handling of error conditions for the WebSocket server,
         particularly during Tomcat shutdown. (markt)
       </fix>
+      <fix>
+        Correct a regression in the fix for <bug>66574</bug> that meant the
+        WebSocket session could return false for <code>onOpen()</code> before
+        the <code>onClose()</code> event had been completed. (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