@@ -764,9 +764,9 @@ def _apply_resolve_activity(
764764 workflow_type = self ._info .workflow_type ,
765765 activity_type = handle ._input .activity ,
766766 activity_task_queue = (
767- handle ._input .task_queue or ""
767+ handle ._input .task_queue or self . _info . task_queue
768768 if isinstance (handle ._input , StartActivityInput )
769- else ""
769+ else self . _info . task_queue
770770 ),
771771 is_local = isinstance (handle ._input , StartLocalActivityInput ),
772772 )
@@ -2803,9 +2803,11 @@ def _apply_schedule_command(
28032803 workflow_id = self ._instance ._info .workflow_id ,
28042804 workflow_type = self ._instance ._info .workflow_type ,
28052805 activity_type = self ._input .activity ,
2806- activity_task_queue = self ._input .task_queue or ""
2807- if isinstance (self ._input , StartActivityInput )
2808- else "" ,
2806+ activity_task_queue = (
2807+ self ._input .task_queue or self ._instance ._info .task_queue
2808+ if isinstance (self ._input , StartActivityInput )
2809+ else self ._instance ._info .task_queue
2810+ ),
28092811 is_local = isinstance (self ._input , StartLocalActivityInput ),
28102812 )
28112813 payload_converter = payload_converter .with_context (context )
0 commit comments