Deadlock in WsSession/WebSocket #205

Author: chronoxor

source/NetCoreServer/WebSocket.cs

@@ -510,20 +510,14 @@ public int RequiredReceiveFrameSize()
         /// </summary>
         public void ClearWsBuffers()
         {
-            lock (WsSendLock)
-            {
-                WsSendBuffer.Clear();
-                Array.Clear(WsSendMask, 0, WsSendMask.Length);
-            }
-
-            // Sometimes on disconnect the receive lock could be taken by receive thread.
-            // In this case we'll skip the receive buffer clearing. It will happen on
-            // re-connect then or in GC.
-
+            // Clear the receive buffer
             bool acquiredReceiveLock = false;
 
             try
             {
+                // Sometimes on disconnect the receive lock could be taken by receive thread.
+                // In this case we'll skip the receive buffer clearing. It will happen on
+                // re-connect then or in GC.
                 Monitor.TryEnter(WsReceiveLock, ref acquiredReceiveLock);
                 if (acquiredReceiveLock)
                 {
@@ -541,6 +535,13 @@ public void ClearWsBuffers()
                 if (acquiredReceiveLock)
                     Monitor.Exit(WsReceiveLock);
             }
+
+            // Clear the send buffer
+            lock (WsSendLock)
+            {
+                WsSendBuffer.Clear();
+                Array.Clear(WsSendMask, 0, WsSendMask.Length);
+            }
         }
 
         /// <summary>