Merge pull request #1086 from mamidenn/patch-1

danielgerlag · web-flow · commit 27114c08788d · 2022-08-27T11:42:47.000-07:00
Make QueueConsumer.Stop() idempotent
diff --git a/src/WorkflowCore/Services/BackgroundTasks/QueueConsumer.cs b/src/WorkflowCore/Services/BackgroundTasks/QueueConsumer.cs
@@ -53,8 +53,11 @@ public virtual void Start()
         public virtual void Stop()
         {
             _cancellationTokenSource.Cancel();
-            DispatchTask.Wait();
-            DispatchTask = null;
+            if (DispatchTask != null)
+            {
+                DispatchTask.Wait();
+                DispatchTask = null;
+            }
         }
 
         private async Task Execute()

Original file line number	Diff line number	Diff line change
`@@ -53,8 +53,11 @@ public virtual void Start()`
`53`	`53`	`public virtual void Stop()`
`54`	`54`	`{`
`55`	`55`	`_cancellationTokenSource.Cancel();`
`56`		`- DispatchTask.Wait();`
`57`		`- DispatchTask = null;`
	`56`	`+ if (DispatchTask != null)`
	`57`	`+ {`
	`58`	`+ DispatchTask.Wait();`
	`59`	`+ DispatchTask = null;`
	`60`	`+ }`
`58`	`61`	`}`
`59`	`62`
`60`	`63`	`private async Task Execute()`