From c06d8ba0f9e0df7a820afcf46abfde90e6341b40 Mon Sep 17 00:00:00 2001
From: jun-he <jun-he@users.noreply.github.com>
Date: Fri, 23 Apr 2021 15:25:39 -0700
Subject: [PATCH] Fix WorkflowRepairService if the workflow is removed

`verifyAndRepairWorkflowTasks` might be called when the workflow has already been removed.
---
 .../conductor/core/execution/WorkflowRepairService.java       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/com/netflix/conductor/core/execution/WorkflowRepairService.java b/core/src/main/java/com/netflix/conductor/core/execution/WorkflowRepairService.java
index 1afefbc341..5d2b0daaaa 100644
--- a/core/src/main/java/com/netflix/conductor/core/execution/WorkflowRepairService.java
+++ b/core/src/main/java/com/netflix/conductor/core/execution/WorkflowRepairService.java
@@ -93,7 +93,9 @@ public boolean verifyAndRepairWorkflow(String workflowId, boolean includeTasks)
      */
     public void verifyAndRepairWorkflowTasks(String workflowId) {
         Workflow workflow = executionDAO.getWorkflow(workflowId, true);
-        workflow.getTasks().forEach(task -> verifyAndRepairTask(task));
+        if (workflow != null) {
+            workflow.getTasks().forEach(task -> verifyAndRepairTask(task));
+        }
     }
 
     /**