fix destructor usage with tls context

1 files changed, 3 insertions, 4 deletions

diff --git a/library/cpp/actors/core/executor_thread.cpp b/library/cpp/actors/core/executor_thread.cpp
index 10a35ff422..31b1362cbf 100644
--- a/library/cpp/actors/core/executor_thread.cpp
+++ b/library/cpp/actors/core/executor_thread.cpp
@@ -152,13 +152,12 @@ namespace NActors {
         bool firstEvent = true;
         bool preempted = false;
         for (; Ctx.ExecutedEvents < Ctx.EventsPerMailbox; ++Ctx.ExecutedEvents) {
-            TAutoPtr<IEventHandle> ev(mailbox->Pop());
-            if (!!ev) {
+            if (TAutoPtr<IEventHandle> ev = mailbox->Pop()) {
                 NHPTimer::STime hpnow;
                 recipient = ev->GetRecipientRewrite();
+                TActorContext ctx(*mailbox, *this, hpprev, recipient);
+                TlsActivationContext = &ctx; // ensure dtor (if any) is called within actor system
                 if (actor = mailbox->FindActor(recipient.LocalId())) {
-                    TActorContext ctx(*mailbox, *this, hpprev, recipient);
-                    TlsActivationContext = &ctx;
 
                     // Since actor is not null there should be no exceptions
                     actorType = &typeid(*actor);