[UNDERTOW-2532] prevents intrinsic lock from being affected when transmitting partial messages through the websocket channel

Author: raccoonback

websockets-jsr/src/main/java/io/undertow/websockets/jsr/WebSocketSessionRemoteEndpoint.java

@@ -17,24 +17,24 @@
  */
 package io.undertow.websockets.jsr;
 
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+import java.util.concurrent.Future;
+
 import io.undertow.websockets.core.BinaryOutputStream;
 import io.undertow.websockets.core.StreamSinkFrameChannel;
 import io.undertow.websockets.core.WebSocketCallback;
 import io.undertow.websockets.core.WebSocketFrameType;
 import io.undertow.websockets.core.WebSocketUtils;
 import io.undertow.websockets.core.WebSockets;
-import org.xnio.channels.Channels;
-
 import jakarta.websocket.EncodeException;
 import jakarta.websocket.RemoteEndpoint;
 import jakarta.websocket.SendHandler;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-import java.nio.ByteBuffer;
-import java.nio.charset.StandardCharsets;
-import java.util.concurrent.Future;
+import org.xnio.channels.Channels;
 
 /**
  * {@link RemoteEndpoint} implementation which uses a WebSocketSession for all its operation.
@@ -243,11 +243,9 @@ class BasicWebSocketSessionRemoteEndpoint implements Basic {
         private StreamSinkFrameChannel binaryFrameSender;
         private StreamSinkFrameChannel textFrameSender;
 
-        public void assertNotInFragment() {
-            synchronized (this) {
-                if (textFrameSender != null || binaryFrameSender != null) {
-                    throw JsrWebSocketMessages.MESSAGES.cannotSendInMiddleOfFragmentedMessage();
-                }
+        public synchronized void assertNotInFragment() {
+            if (textFrameSender != null || binaryFrameSender != null) {
+                throw JsrWebSocketMessages.MESSAGES.cannotSendInMiddleOfFragmentedMessage();
             }
         }
 
@@ -270,29 +268,23 @@ public void sendBinary(final ByteBuffer data) throws IOException {
             data.clear(); //for some reason the TCK expects this, might as well just match the RI behaviour
         }
 
-        @Override
+       @Override
         public void sendText(final String partialMessage, final boolean isLast) throws IOException {
-            if(partialMessage == null) {
+            if (partialMessage == null) {
                 throw JsrWebSocketMessages.MESSAGES.messageInNull();
             }
 
-            synchronized (this) {
-                if (binaryFrameSender != null) {
-                    throw JsrWebSocketMessages.MESSAGES.cannotSendInMiddleOfFragmentedMessage();
-                }
-                if(textFrameSender == null) {
-                    textFrameSender = undertowSession.getWebSocketChannel().send(WebSocketFrameType.TEXT);
+            StreamSinkFrameChannel sender = getTextFrameSender();
+
+            try {
+                Channels.writeBlocking(sender, WebSocketUtils.fromUtf8String(partialMessage));
+                if (isLast) {
+                    sender.shutdownWrites();
                 }
-                try {
-                    Channels.writeBlocking(textFrameSender, WebSocketUtils.fromUtf8String(partialMessage));
-                    if(isLast) {
-                        textFrameSender.shutdownWrites();
-                    }
-                    Channels.flushBlocking(textFrameSender);
-                } finally {
-                    if(isLast) {
-                        textFrameSender = null;
-                    }
+                Channels.flushBlocking(sender);
+            } finally {
+                if (isLast) {
+                    clearTextFrameSender();
                 }
             }
         }
@@ -303,27 +295,49 @@ public void sendBinary(final ByteBuffer partialByte, final boolean isLast) throw
                 throw JsrWebSocketMessages.MESSAGES.messageInNull();
             }
 
-            synchronized (this) {
-                if (textFrameSender != null) {
-                    throw JsrWebSocketMessages.MESSAGES.cannotSendInMiddleOfFragmentedMessage();
-                }
-                if (binaryFrameSender == null) {
-                    binaryFrameSender = undertowSession.getWebSocketChannel().send(WebSocketFrameType.BINARY);
-                }
-                try {
-                    Channels.writeBlocking(binaryFrameSender, partialByte);
-                    if (isLast) {
-                        binaryFrameSender.shutdownWrites();
-                    }
-                    Channels.flushBlocking(binaryFrameSender);
+            StreamSinkFrameChannel sender = getBinaryFrameSender();
+
+            try {
+                Channels.writeBlocking(sender, partialByte);
+                if (isLast) {
+                    sender.shutdownWrites();
                 }
-                finally {
-                    if (isLast) {
-                        binaryFrameSender = null;
-                    }
+                Channels.flushBlocking(sender);
+            }
+            finally {
+                if (isLast) {
+                    clearBinaryFrameSender();
                 }
-                partialByte.clear();
             }
+            partialByte.clear();
+        }
+
+        private synchronized StreamSinkFrameChannel getTextFrameSender() throws IOException {
+            if (binaryFrameSender != null) {
+                throw JsrWebSocketMessages.MESSAGES.cannotSendInMiddleOfFragmentedMessage();
+            }
+            if (textFrameSender == null) {
+                textFrameSender = undertowSession.getWebSocketChannel().send(WebSocketFrameType.TEXT);
+            }
+            return textFrameSender;
+        }
+
+        private synchronized void clearTextFrameSender() {
+            textFrameSender = null;
+        }
+
+        private synchronized StreamSinkFrameChannel getBinaryFrameSender() throws IOException {
+            if (textFrameSender != null) {
+                throw JsrWebSocketMessages.MESSAGES.cannotSendInMiddleOfFragmentedMessage();
+            }
+            if (binaryFrameSender == null) {
+                binaryFrameSender = undertowSession.getWebSocketChannel().send(WebSocketFrameType.BINARY);
+            }
+            return binaryFrameSender;
+        }
+
+        private synchronized void clearBinaryFrameSender() {
+            binaryFrameSender = null;
         }
 
         @Override