From 122f5fa454670227db1d675d71806a97241e1cfe Mon Sep 17 00:00:00 2001 From: Dandevmt <34411636+Dandevmt@users.noreply.github.com> Date: Sun, 7 Jun 2020 05:07:38 -0600 Subject: [PATCH] return done when the collection is empty (#313) Co-authored-by: Dan Absher --- .../Elsa.Activities.ControlFlow/Activities/ForEach.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/activities/Elsa.Activities.ControlFlow/Activities/ForEach.cs b/src/activities/Elsa.Activities.ControlFlow/Activities/ForEach.cs index 888fc2b80..46a738c34 100644 --- a/src/activities/Elsa.Activities.ControlFlow/Activities/ForEach.cs +++ b/src/activities/Elsa.Activities.ControlFlow/Activities/ForEach.cs @@ -48,6 +48,11 @@ namespace Elsa.Activities.ControlFlow.Activities var collection = await expressionEvaluator.EvaluateAsync(CollectionExpression, context, cancellationToken); var index = CurrentIndex; + if (collection.Count == 0) + { + return Done(); + } + if (index >= collection.Count) { context.EndScope();