Update src/InProcessTestHost/Sidecar/InMemoryOrchestrationService.cs

YunchuWang · Copilot · web-flow · commit 8fc24d9b6d79 · 2025-12-17T15:01:04.000-08:00
Co-authored-by: Copilot &lt;175728472+Copilot@users.noreply.github.com&gt;
diff --git a/src/InProcessTestHost/Sidecar/InMemoryOrchestrationService.cs b/src/InProcessTestHost/Sidecar/InMemoryOrchestrationService.cs
@@ -756,8 +756,11 @@ public Task<OrchestrationState> WaitForInstanceAsync(string instanceId, Cancella
                             statusRecord.OrchestrationStatus == OrchestrationStatus.Failed ||
                             statusRecord.OrchestrationStatus == OrchestrationStatus.Terminated)
                         {
-                            // Orchestration has already completed - complete the waiter and return
-                            tcs.TrySetResult(statusRecord);
+                            // Orchestration has already completed - complete the waiter and clean it up
+                            if (tcs.TrySetResult(statusRecord))
+                            {
+                                this.waiters.TryRemove(instanceId, out _);
+                            }
                         }
                     }
                 }

Original file line number	Diff line number	Diff line change
`@@ -756,8 +756,11 @@ public Task<OrchestrationState> WaitForInstanceAsync(string instanceId, Cancella`
`756`	`756`	`statusRecord.OrchestrationStatus == OrchestrationStatus.Failed \|\|`
`757`	`757`	`statusRecord.OrchestrationStatus == OrchestrationStatus.Terminated)`
`758`	`758`	`{`
`759`		`- // Orchestration has already completed - complete the waiter and return`
`760`		`- tcs.TrySetResult(statusRecord);`
	`759`	`+ // Orchestration has already completed - complete the waiter and clean it up`
	`760`	`+ if (tcs.TrySetResult(statusRecord))`
	`761`	`+ {`
	`762`	`+ this.waiters.TryRemove(instanceId, out _);`
	`763`	`+ }`
`761`	`764`	`}`
`762`	`765`	`}`
`763`	`766`	`}`