Synchronize threads on Timer dispose

youscan · Dec 18, 2023 · 7a16c43 · 7a16c43
1 parent 2d48b2c
commit 7a16c43
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/AzureBatchQueue/TimerBatch.cs b/AzureBatchQueue/TimerBatch.cs
@@ -15,6 +15,8 @@ internal class TimerBatch<T>
     Timer? timer;
     BatchCompletedResult? completedResult;
 
+    readonly object locker = new();
+
     public TimerBatch(BatchQueue<T> batchQueue, QueueMessage<T[]> msg, int maxDequeueCount, ILogger logger)
     {
         this.batchQueue = batchQueue;
@@ -85,9 +87,12 @@ async Task DoFlush()
     /// </summary>
     void DisposeTimer()
     {
-        var timerCopy = timer;
-        timer = null;
-        timerCopy.Dispose();
+        lock (locker)
+        {
+            var timerCopy = timer;
+            timer = null;
+            timerCopy.Dispose();
+        }
     }
 
     QueueMessage<T[]> Message()