Allow using TlsActivationContext inside coroutine

2 files changed, 6 insertions, 6 deletions

diff --git a/library/cpp/actors/core/actor_coroutine.cpp b/library/cpp/actors/core/actor_coroutine.cpp
index 0ab4d2b24d..cdd6fdef4c 100644
--- a/library/cpp/actors/core/actor_coroutine.cpp
+++ b/library/cpp/actors/core/actor_coroutine.cpp
@@ -78,7 +78,7 @@ namespace NActors {
 
     const TActorContext& TActorCoroImpl::GetActorContext() const {
         Y_VERIFY(ActorContext);
-        return *ActorContext;
+        return ActorContext.value();
     }
 
     bool TActorCoroImpl::ProcessEvent(THolder<IEventHandle> ev) {
@@ -92,16 +92,16 @@ namespace NActors {
         }
 
         // prepare actor context for in-coroutine use
+        Y_VERIFY(!ActorContext);
         TActivationContext *ac = TlsActivationContext;
-        TlsActivationContext = nullptr;
-        TActorContext ctx(ac->Mailbox, ac->ExecutorThread, ac->EventStart, SelfActorId);
-        ActorContext = &ctx;
+        ActorContext.emplace(ac->Mailbox, ac->ExecutorThread, ac->EventStart, SelfActorId);
+        TlsActivationContext = &ActorContext.value();
 
         Resume();
 
         // drop actor context
         TlsActivationContext = ac;
-        ActorContext = nullptr;
+        ActorContext.reset();
 
         return Finished;
     }
diff --git a/library/cpp/actors/core/actor_coroutine.h b/library/cpp/actors/core/actor_coroutine.h
index 6f04f70ef8..16651da81d 100644
--- a/library/cpp/actors/core/actor_coroutine.h
+++ b/library/cpp/actors/core/actor_coroutine.h
@@ -21,7 +21,7 @@ namespace NActors {
         THolder<IEventHandle> PendingEvent;
         bool Finished = false;
         ui64 WaitCookie = 0;
-        TActorContext *ActorContext = nullptr;
+        std::optional<TActorContext> ActorContext;
 
     protected:
         TActorIdentity SelfActorId = TActorIdentity(TActorId());