Merge pull request #4912 from eclipse/jetty-10.0.x-4907-suspendAfterC…

…loseRace

Issue #4907 - close websocket suspendState if close frame is received

jetty-websocket/websocket-jetty-common/src/main/java/org/eclipse/jetty/websocket/common/JettyWebSocketFrameHandler.java

@@ -204,6 +204,10 @@ public void onFrame(Frame frame, Callback callback)
                 default:
                     throw new IllegalStateException();
             }
+
+            // If we have received a close frame, set state to closed to disallow further suspends and resumes.
+            if (frame.getOpCode() == OpCode.CLOSE)
+                state = SuspendState.CLOSED;
         }
 
         // Send to raw frame handling on user side (eg: WebSocketFrameListener)
@@ -296,7 +300,7 @@ public void onClosed(CloseStatus closeStatus, Callback callback)
     {
         synchronized (this)
         {
-            // We are now closed and cannot suspend or resume
+            // We are now closed and cannot suspend or resume.
             state = SuspendState.CLOSED;
         }