Check stop flag before getting activation, KIKIMr-18950

1 files changed, 2 insertions, 2 deletions

diff --git a/library/cpp/actors/core/executor_pool_basic.cpp b/library/cpp/actors/core/executor_pool_basic.cpp
index 6bf21252f5..d7d0dcfead 100644
--- a/library/cpp/actors/core/executor_pool_basic.cpp
+++ b/library/cpp/actors/core/executor_pool_basic.cpp
@@ -247,7 +247,7 @@ namespace NActors {
 
         TAtomic x = AtomicGet(Semaphore);
         TSemaphore semaphore = TSemaphore::GetSemaphore(x);
-        do {
+        while (!RelaxedLoad(&StopFlag)) {
             if (!semaphore.OldSemaphore || semaphore.CurrentSleepThreadCount < 0) {
                 if (workerId < 0 || !wctx.IsNeededToWaitNextActivation) {
                     timers.HPNow = GetCycleCountFast();
@@ -286,7 +286,7 @@ namespace NActors {
             SpinLockPause();
             x = AtomicGet(Semaphore);
             semaphore = TSemaphore::GetSemaphore(x);
-        } while (!RelaxedLoad(&StopFlag));
+        }
 
         return 0;
     }