Merge branch '2.31' of github.com:Netflix/conductor into 2.31

Netflix · Apr 14, 2021 · 98c75e9 · 98c75e9
2 parents 1006a2f + 7053043
commit 98c75e9
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/core/src/main/java/com/netflix/conductor/core/execution/WorkflowExecutor.java b/core/src/main/java/com/netflix/conductor/core/execution/WorkflowExecutor.java
@@ -1146,9 +1146,9 @@ List<String> cancelNonTerminalTasks(Workflow workflow) {
         }
         if (erroredTasks.isEmpty()) {
             try {
-                queueDAO.remove(DECIDER_QUEUE, workflow.getWorkflowId());
                 workflowStatusListener.onWorkflowFinalizedIfEnabled(workflow);
-            } catch (Exception e) {
+                queueDAO.remove(DECIDER_QUEUE, workflow.getWorkflowId());
+	    } catch (Exception e) {
                 LOGGER.error("Error removing workflow: {} from decider queue", workflow.getWorkflowId(), e);
             }
         }