From fb3ef08463da84e920dbe356f81b35fe7ea812c3 Mon Sep 17 00:00:00 2001
From: wangxw <996268132@qq.com>
Date: Fri, 9 Aug 2024 15:31:13 +0800
Subject: [PATCH] Merge tag 'v1.6.9' into release/1.11

# Conflicts:
#	actor/actor.go
#	actor/manager/container.go
#	actor/manager/manager.go
#	actor/mock/mock_server.go
---
 actor/manager/container.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/actor/manager/container.go b/actor/manager/container.go
index ca1c85fa..bb03f43b 100644
--- a/actor/manager/container.go
+++ b/actor/manager/container.go
@@ -80,7 +80,7 @@ func NewDefaultActorContainerContext(ctx context.Context, actorID string, impl a
 	impl.SetID(actorID)
 	daprClient, _ := dapr.NewClient()
 	// create state manager for this new actor
-	impl.SetStateManager(state.NewActorStateManager(impl.Type(), actorID, state.NewDaprStateAsyncProvider(daprClient)))
+	impl.SetStateManager(state.NewActorStateManagerContext(impl.Type(), actorID, state.NewDaprStateAsyncProvider(daprClient)))
 	// move out for Activate param
 	/*err := impl.Activate(ctx)
 	if err != nil {