[tomcat] branch 8.5.x updated: Further fix for regression in previous BZ 66574 fix.

[ma...@apache.org]

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 70ccf2a624 Further fix for regression in previous BZ 66574 fix.
70ccf2a624 is described below

commit 70ccf2a624b5dba544d1f77d210c27e713023a3a
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Jun 20 22:53:16 2023 +0100

    Further fix for regression in previous BZ 66574 fix.
    
    Both new states need to be accounted for to fix the regression.
---
 java/org/apache/tomcat/websocket/WsSession.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/tomcat/websocket/WsSession.java b/java/org/apache/tomcat/websocket/WsSession.java
index 3d5ebdbf10..602e14b671 100644
--- a/java/org/apache/tomcat/websocket/WsSession.java
+++ b/java/org/apache/tomcat/websocket/WsSession.java
@@ -542,7 +542,7 @@ public class WsSession implements Session {
 
     @Override
     public boolean isOpen() {
-        return state.get() == State.OPEN || state.get() == State.OUTPUT_CLOSING;
+        return state.get() == State.OPEN || state.get() == State.OUTPUT_CLOSING || state.get() == State.CLOSING;
     }
 
 


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org