Merge pull request #2315 from Aaronontheweb/fix-2314-hwt

close #2314 - fixes shutdown race condition with HashedWheelTimer
akkadotnet · Sep 21, 2016 · 078b7d6 · 078b7d6
2 parents 8086e25 + 8c87818
commit 078b7d6
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/core/Akka/Actor/Scheduler/HashedWheelTimerScheduler.cs b/src/core/Akka/Actor/Scheduler/HashedWheelTimerScheduler.cs
@@ -312,10 +312,11 @@ protected override void InternalScheduleRepeatedly(TimeSpan initialDelay, TimeSp
         private Task<IEnumerable<SchedulerRegistration>> Stop()
         {
             var p = new TaskCompletionSource<IEnumerable<SchedulerRegistration>>();
+
+            if (_stopped.CompareAndSet(null, p)
 #pragma warning disable 420
-            if (Interlocked.CompareExchange(ref _workerState, WORKER_STATE_SHUTDOWN, WORKER_STATE_STARTED) == WORKER_STATE_STARTED
+                && Interlocked.CompareExchange(ref _workerState, WORKER_STATE_SHUTDOWN, WORKER_STATE_STARTED) == WORKER_STATE_STARTED)
 #pragma warning restore 420
-                && _stopped.CompareAndSet(null, p))
             {
                 // Let remaining work that is already being processed finished. The termination task will complete afterwards
                 return p.Task;