next execution time for control steps

Author: Daniel Gerlag

src/WorkflowCore/Services/WorkflowExecutor.cs

@@ -227,7 +227,7 @@ private void DetermineNextExecutionTime(WorkflowInstance workflow)
             if (workflow.Status == WorkflowStatus.Complete)
                 return;
 
-            foreach (var pointer in workflow.ExecutionPointers.Where(x => x.Active))
+            foreach (var pointer in workflow.ExecutionPointers.Where(x => x.Active && (x.Children ?? new List<string>()).Count == 0))
             {
                 if (!pointer.SleepUntil.HasValue)
                 {
@@ -238,7 +238,19 @@ private void DetermineNextExecutionTime(WorkflowInstance workflow)
                 long pointerSleep = pointer.SleepUntil.Value.ToUniversalTime().Ticks;
                 workflow.NextExecution = Math.Min(pointerSleep, workflow.NextExecution ?? pointerSleep);
             }
-            
+
+            if (workflow.NextExecution == null)
+            {
+                foreach (var pointer in workflow.ExecutionPointers.Where(x => x.Active && (x.Children ?? new List<string>()).Count > 0))
+                {
+                    if (workflow.ExecutionPointers.Where(x => pointer.Children.Contains(x.Id)).All(x => x.EndTime != null))
+                    {
+                        workflow.NextExecution = 0;
+                        return;
+                    }                    
+                }
+            }
+
             if ((workflow.NextExecution == null) && (workflow.ExecutionPointers.All(x => x.EndTime != null)))
             {
                 workflow.Status = WorkflowStatus.Complete;

src/WorkflowCore/WorkflowCore.csproj

@@ -18,9 +18,9 @@
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
     <Description>Workflow Core is a light weight workflow engine targeting .NET Standard.</Description>
-    <Version>1.2.0</Version>
-    <AssemblyVersion>1.2.0.0</AssemblyVersion>
-    <FileVersion>1.2.0.0</FileVersion>
+    <Version>1.2.1</Version>
+    <AssemblyVersion>1.2.1.0</AssemblyVersion>
+    <FileVersion>1.2.1.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>