Merge pull request #11086 from jetty/jetty-12.0.x-11081-websocketRace

Issue #11081 - fix race condition in WebSocket FrameHandlers (jetty-12)
jetty · Dec 29, 2023 · 2505d0e · 2505d0e
2 parents 965e4af + 37a296d
commit 2505d0e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 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
@@ -389,9 +389,10 @@ private void acceptFrame(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);
     }
 
     boolean isAutoDemand()

diff --git a/...in/java/org/eclipse/jetty/ee10/websocket/jakarta/common/JakartaWebSocketFrameHandler.java b/...in/java/org/eclipse/jetty/ee10/websocket/jakarta/common/JakartaWebSocketFrameHandler.java
@@ -583,9 +583,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/...ain/java/org/eclipse/jetty/ee9/websocket/jakarta/common/JakartaWebSocketFrameHandler.java b/...ain/java/org/eclipse/jetty/ee9/websocket/jakarta/common/JakartaWebSocketFrameHandler.java
@@ -590,9 +590,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/...mmon/src/main/java/org/eclipse/jetty/ee9/websocket/common/JettyWebSocketFrameHandler.java b/...mmon/src/main/java/org/eclipse/jetty/ee9/websocket/common/JettyWebSocketFrameHandler.java
@@ -329,9 +329,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)