Issue #4907 - moved to close state if any close frame is received

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
jetty · May 27, 2020 · 277561e · 277561e
1 parent d8fb116
commit 277561e
Showing 1 changed file with 11 additions and 10 deletions.
diff --git a/...y-common/src/main/java/org/eclipse/jetty/websocket/common/JettyWebSocketFrameHandler.java b/...y-common/src/main/java/org/eclipse/jetty/websocket/common/JettyWebSocketFrameHandler.java
@@ -206,6 +206,16 @@ public void onFrame(Frame frame, Callback callback)
             }
         }
 
+        // If we have received a close frame, set state to closed to disallow suspends and resumes.
+        byte opCode = frame.getOpCode();
+        if (opCode == OpCode.CLOSE)
+        {
+            synchronized (this)
+            {
+                state = SuspendState.CLOSED;
+            }
+        }
+
         // Send to raw frame handling on user side (eg: WebSocketFrameListener)
         if (frameHandle != null)
         {
@@ -237,7 +247,7 @@ public void onFrame(Frame frame, Callback callback)
             callback::failed
         );
 
-        switch (frame.getOpCode())
+        switch (opCode)
         {
             case OpCode.CLOSE:
                 onCloseFrame(frame, callback);
@@ -313,15 +323,6 @@ private void notifyOnClose(CloseStatus closeStatus, Callback callback)
             return;
         }
 
-        // If we have received the final close frame set state to closed to disallow suspends and resumes.
-        if (!session.getCoreSession().isOutputOpen())
-        {
-            synchronized (this)
-            {
-                state = SuspendState.CLOSED;
-            }
-        }
-
         try
         {
             if (closeHandle != null)