Merge pull request #700 from danielgerlag/issue605

issue 605

Author: danielgerlag

src/WorkflowCore/Services/WorkflowExecutor.cs

@@ -229,22 +229,19 @@ private async Task DetermineNextExecutionTime(WorkflowInstance workflow, Workflo
                 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))
             {
-                foreach (var pointer in workflow.ExecutionPointers.Where(x => x.Active && (x.Children ?? new List<string>()).Count > 0))
-                {
-                    if (!workflow.ExecutionPointers.FindByScope(pointer.Id).All(x => x.EndTime.HasValue))
-                        continue;
-
-                    if (!pointer.SleepUntil.HasValue)
-                    {
-                        workflow.NextExecution = 0;
-                        return;
-                    }
+                if (!workflow.ExecutionPointers.FindByScope(pointer.Id).All(x => x.EndTime.HasValue))
+                    continue;
 
-                    var pointerSleep = pointer.SleepUntil.Value.ToUniversalTime().Ticks;
-                    workflow.NextExecution = Math.Min(pointerSleep, workflow.NextExecution ?? pointerSleep);
+                if (!pointer.SleepUntil.HasValue)
+                {
+                    workflow.NextExecution = 0;
+                    return;
                 }
+
+                var pointerSleep = pointer.SleepUntil.Value.ToUniversalTime().Ticks;
+                workflow.NextExecution = Math.Min(pointerSleep, workflow.NextExecution ?? pointerSleep);
             }
 
             if ((workflow.NextExecution != null) || (workflow.ExecutionPointers.Any(x => x.EndTime == null)))

src/WorkflowCore/WorkflowCore.csproj

@@ -15,12 +15,12 @@
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
     <Description>Workflow Core is a light weight workflow engine targeting .NET Standard.</Description>
-    <Version>3.3.0</Version>
-    <AssemblyVersion>3.3.0.0</AssemblyVersion>
-    <FileVersion>3.3.0.0</FileVersion>
+    <Version>3.3.1</Version>
+    <AssemblyVersion>3.3.1.0</AssemblyVersion>
+    <FileVersion>3.3.1.0</FileVersion>
     <PackageReleaseNotes></PackageReleaseNotes>
     <PackageIconUrl>https://github.com/danielgerlag/workflow-core/raw/master/src/logo.png</PackageIconUrl>
-    <PackageVersion>3.3.0</PackageVersion>
+    <PackageVersion>3.3.1</PackageVersion>
   </PropertyGroup>
 
   <ItemGroup>