Skip to content

Cherry-pick some fix from master #148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Simon Porter (simonporter) merged 2 commits into from
May 18, 2018
Merged

Cherry-pick some fix from master #148

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa14a29
Fix for the issue where issuing TerminateInstanceAsync twice from cli…
PradeepKadubandi Aug 30, 2017
c81daed
Handle the case where an orchestration completes and terminates at th…
cgillum Mar 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions Framework/TaskOrchestrationContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ internal class TaskOrchestrationContext : OrchestrationContext
readonly IDictionary<int, OrchestratorAction> orchestratorActionsMap;
readonly TaskScheduler taskScheduler;
OrchestrationCompleteOrchestratorAction continueAsNew;
bool executionTerminated;
int idCounter;

public TaskOrchestrationContext(OrchestrationInstance orchestrationInstance, TaskScheduler taskScheduler)
Expand Down Expand Up @@ -340,12 +341,19 @@ public void HandleTimerFiredEvent(TimerFiredEvent timerFiredEvent)

public void HandleExecutionTerminatedEvent(ExecutionTerminatedEvent terminatedEvent)
{
CompleteOrchestration(terminatedEvent.Input, null, OrchestrationStatus.Terminated);
if (!executionTerminated)
{
executionTerminated = true;
CompleteOrchestration(terminatedEvent.Input, null, OrchestrationStatus.Terminated);
}
}

public void CompleteOrchestration(string result)
{
CompleteOrchestration(result, null, OrchestrationStatus.Completed);
if (!executionTerminated)
{
CompleteOrchestration(result, null, OrchestrationStatus.Completed);
}
}

public void FailOrchestration(Exception failure)
Expand Down