From a12a71f36747b7544956cfe0ce140cad18dcc199 Mon Sep 17 00:00:00 2001 From: Sipke Schoorstra Date: Tue, 11 Nov 2025 16:56:38 +0100 Subject: [PATCH] Renames and makes async cancel method. Renames the `CancelAncestorActivatesAsync` method to `CancelAncestorActivitiesAsync` for clarity and makes it a proper async method, ensuring correct asynchronous execution. This prevents potential issues when cancelling ancestor activities. --- .../Activities/Flowchart/Activities/FlowJoin.cs | 4 ++-- .../Activities/Flowchart/Activities/Flowchart.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/Elsa.Workflows.Core/Activities/Flowchart/Activities/FlowJoin.cs b/src/modules/Elsa.Workflows.Core/Activities/Flowchart/Activities/FlowJoin.cs index 65390c828..067efafc8 100644 --- a/src/modules/Elsa.Workflows.Core/Activities/Flowchart/Activities/FlowJoin.cs +++ b/src/modules/Elsa.Workflows.Core/Activities/Flowchart/Activities/FlowJoin.cs @@ -43,7 +43,7 @@ public class FlowJoin : Activity, IJoinNode { if (Flowchart.CanWaitAllProceed(context)) { - Flowchart.CancelAncestorActivatesAsync(context); + await Flowchart.CancelAncestorActivitiesAsync(context); await context.CompleteActivityAsync(); } @@ -51,7 +51,7 @@ public class FlowJoin : Activity, IJoinNode } case FlowJoinMode.WaitAny: { - Flowchart.CancelAncestorActivatesAsync(context); + await Flowchart.CancelAncestorActivitiesAsync(context); await context.CompleteActivityAsync(); break; } diff --git a/src/modules/Elsa.Workflows.Core/Activities/Flowchart/Activities/Flowchart.cs b/src/modules/Elsa.Workflows.Core/Activities/Flowchart/Activities/Flowchart.cs index 1d24195ee..217a9315f 100644 --- a/src/modules/Elsa.Workflows.Core/Activities/Flowchart/Activities/Flowchart.cs +++ b/src/modules/Elsa.Workflows.Core/Activities/Flowchart/Activities/Flowchart.cs @@ -351,7 +351,7 @@ public class Flowchart : Container return flowScope.AllInboundConnectionsVisited(flowGraph, activity); } - public static async void CancelAncestorActivatesAsync(ActivityExecutionContext context) + public static async Task CancelAncestorActivitiesAsync(ActivityExecutionContext context) { var flowchartContext = context.ParentActivityExecutionContext!; var flowchart = (Flowchart)flowchartContext.Activity;