tried to fix null reference exception in websocket server middleware

kerryjiang · May 11, 2024 · 90b389b · 90b389b
1 parent c2267d2
commit 90b389b
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/src/SuperSocket.WebSocket.Server/WebSocketServerMiddleware.cs b/src/SuperSocket.WebSocket.Server/WebSocketServerMiddleware.cs
@@ -62,12 +62,18 @@ public override void Start(IServer server)
 
         public override void Shutdown(IServer server)
         {
+            _sessionContainerMiddleware = null;
+
             var checkTimer = _checkingTimer;
-            _checkingTimer = null;
-            checkTimer.Change(Timeout.Infinite, Timeout.Infinite);
-            checkTimer.Dispose();
 
-            _sessionContainerMiddleware = null;
+            if (checkTimer == null)
+                return;
+
+            if (Interlocked.CompareExchange(ref _checkingTimer, null, checkTimer) == checkTimer)
+            {
+                checkTimer.Change(Timeout.Infinite, Timeout.Infinite);
+                checkTimer.Dispose();
+            }            
         }
 
         public override ValueTask<bool> RegisterSession(IAppSession session)