.

Author: Daniel Gerlag

src/WorkflowCore/Services/WorkflowThread.cs

@@ -67,8 +67,14 @@ private void RunWorkflows()
                                     workflow = _persistenceStore.GetWorkflowInstance(workflowId).Result;
                                     if (workflow.Status == WorkflowStatus.Runnable)
                                     {
-                                        result = _executor.Execute(workflow, _options);
-                                        _persistenceStore.PersistWorkflow(workflow).Wait();
+                                        try
+                                        {
+                                            result = _executor.Execute(workflow, _options);
+                                        }
+                                        finally
+                                        {
+                                            _persistenceStore.PersistWorkflow(workflow).Wait();
+                                        }
                                     }
                                 }
                                 finally

src/providers/WorkflowCore.Persistence.EntityFramework/Services/EntityFrameworkPersistenceProvider.cs

@@ -330,11 +330,14 @@ public async Task MarkEventUnprocessed(string id)
 
         public async Task PersistErrors(IEnumerable<ExecutionError> errors)
         {
-            foreach (var error in errors)
+            lock (this)
             {
-                Set<PersistedExecutionError>().Add(error.ToPersistable());
+                foreach (var error in errors)
+                {
+                    Set<PersistedExecutionError>().Add(error.ToPersistable());
+                }
+                SaveChanges();
             }
-            await SaveChangesAsync();
         }
     }
 #pragma warning restore CS1998 // Async method lacks 'await' operators and will run synchronously