Merge pull request #11084 from jetty/jetty-10.0.x-11081-websocketRace

Issue #11081 - fix race condition in WebSocket FrameHandlers
jetty · Dec 20, 2023 · 1fb3f31 · 1fb3f31
2 parents c91e3fb + e69f1d2
commit 1fb3f31
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/...on/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler.java b/...on/src/main/java/org/eclipse/jetty/websocket/javax/common/JavaxWebSocketFrameHandler.java
@@ -596,9 +596,10 @@ private void acceptMessage(Frame frame, Callback callback)
         }
 
         // Accept the payload into the message sink
-        activeMessageSink.accept(frame, callback);
+        MessageSink messageSink = activeMessageSink;
         if (frame.isFin())
             activeMessageSink = null;
+        messageSink.accept(frame, callback);
     }
 
     public void onPing(Frame frame, Callback callback)

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
@@ -345,9 +345,10 @@ private void acceptMessage(Frame frame, Callback callback)
         }
 
         // Accept the payload into the message sink
-        activeMessageSink.accept(frame, callback);
+        MessageSink messageSink = activeMessageSink;
         if (frame.isFin())
             activeMessageSink = null;
+        messageSink.accept(frame, callback);
     }
 
     private void onBinaryFrame(Frame frame, Callback callback)