diff --git a/src/modules/Elsa.Workflows.Core/Contexts/ActivityExecutionContext.cs b/src/modules/Elsa.Workflows.Core/Contexts/ActivityExecutionContext.cs index 667faa22a..4865d4abd 100644 --- a/src/modules/Elsa.Workflows.Core/Contexts/ActivityExecutionContext.cs +++ b/src/modules/Elsa.Workflows.Core/Contexts/ActivityExecutionContext.cs @@ -44,7 +44,7 @@ public partial class ActivityExecutionContext : IExecutionContext, IDisposable ActivityState = new ChangeTrackingDictionary(Taint); ActivityInput = new ChangeTrackingDictionary(Taint); WorkflowExecutionContext = workflowExecutionContext; - _parentActivityExecutionContext = parentActivityExecutionContext; + ParentActivityExecutionContext = parentActivityExecutionContext; var expressionExecutionContextProps = ExpressionExecutionContextExtensions.CreateActivityExecutionContextPropertiesFrom(workflowExecutionContext, workflowExecutionContext.Input); expressionExecutionContextProps[ExpressionExecutionContextExtensions.ActivityKey] = activity; ExpressionExecutionContext = new(workflowExecutionContext.ServiceProvider, new(), parentActivityExecutionContext?.ExpressionExecutionContext ?? workflowExecutionContext.ExpressionExecutionContext, expressionExecutionContextProps, Taint, CancellationToken); diff --git a/src/modules/Elsa.Workflows.Core/Extensions/ActivityExecutionContextExtensions.cs b/src/modules/Elsa.Workflows.Core/Extensions/ActivityExecutionContextExtensions.cs index 59a69c68d..91740adde 100644 --- a/src/modules/Elsa.Workflows.Core/Extensions/ActivityExecutionContextExtensions.cs +++ b/src/modules/Elsa.Workflows.Core/Extensions/ActivityExecutionContextExtensions.cs @@ -254,7 +254,7 @@ public static partial class ActivityExecutionContextExtensions return; // Select all child contexts. - var childContexts = context.WorkflowExecutionContext.ActivityExecutionContexts.Where(x => x.ParentActivityExecutionContext == context).ToList(); + var childContexts = context.Children.ToList(); foreach (var childContext in childContexts) await CancelActivityAsync(childContext); @@ -320,7 +320,7 @@ public static partial class ActivityExecutionContextExtensions /// public static IEnumerable GetDescendents(this ActivityExecutionContext context) { - var children = context.WorkflowExecutionContext.ActivityExecutionContexts.Where(x => x.ParentActivityExecutionContext == context).ToList(); + var children = context.Children.ToList(); foreach (var child in children) { @@ -336,7 +336,7 @@ public static partial class ActivityExecutionContextExtensions /// public static IEnumerable GetActiveChildren(this ActivityExecutionContext context) { - return context.WorkflowExecutionContext.ActivityExecutionContexts.Where(x => x.ParentActivityExecutionContext == context); + return context.Children; } /// @@ -344,7 +344,7 @@ public static partial class ActivityExecutionContextExtensions /// public static IEnumerable GetChildren(this ActivityExecutionContext context) { - return context.WorkflowExecutionContext.ActivityExecutionContexts.Where(x => x.ParentActivityExecutionContext == context); + return context.Children; } /// @@ -352,7 +352,7 @@ public static partial class ActivityExecutionContextExtensions /// public static IEnumerable GetDescendants(this ActivityExecutionContext context) { - var children = context.WorkflowExecutionContext.ActivityExecutionContexts.Where(x => x.ParentActivityExecutionContext == context).ToList(); + var children = context.Children.ToList(); foreach (var child in children) {