From 6f337903bc1487f4b042ac2fb8607921e79bed4a Mon Sep 17 00:00:00 2001
From: Chris Gillum <cgillum@gmail.com>
Date: Fri, 2 Mar 2018 16:17:52 -0800
Subject: [PATCH] Handle the case where an orchestration completes and
 terminates at the same time

---
 src/DurableTask.Core/TaskOrchestrationContext.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/DurableTask.Core/TaskOrchestrationContext.cs b/src/DurableTask.Core/TaskOrchestrationContext.cs
index b290b0072..6a8771500 100644
--- a/src/DurableTask.Core/TaskOrchestrationContext.cs
+++ b/src/DurableTask.Core/TaskOrchestrationContext.cs
@@ -386,7 +386,10 @@ public void HandleExecutionTerminatedEvent(ExecutionTerminatedEvent terminatedEv
 
         public void CompleteOrchestration(string result)
         {
-            CompleteOrchestration(result, null, OrchestrationStatus.Completed);
+            if (!executionTerminated)
+            {
+                CompleteOrchestration(result, null, OrchestrationStatus.Completed);
+            }
         }
 
         public void FailOrchestration(Exception failure)