Fixed Task subWorkflowId deep copy.

Netflix · Apr 29, 2020 · c1b1a09 · c1b1a09
1 parent 9871639
commit c1b1a09
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/common/src/main/java/com/netflix/conductor/common/metadata/tasks/Task.java b/common/src/main/java/com/netflix/conductor/common/metadata/tasks/Task.java
@@ -784,7 +784,7 @@ public Task copy() {
         copy.setIteration(iteration);
         copy.setExecutionNameSpace(executionNameSpace);
         copy.setIsolationGroupId(isolationGroupId);
-        copy.setSubWorkflowId(subWorkflowId);
+        copy.setSubWorkflowId(getSubWorkflowId());
 
         return copy;
     }

diff --git a/...ss/src/test/java/com/netflix/conductor/tests/integration/AbstractWorkflowServiceTest.java b/...ss/src/test/java/com/netflix/conductor/tests/integration/AbstractWorkflowServiceTest.java
@@ -5053,7 +5053,6 @@ public void testSubWorkflowRetry() {
                 .filter(t -> t.getStatus().equals(SCHEDULED))
                 .findAny().orElse(null);
         assertNotNull(task);
-        assertNull("Retried task in scheduled state shouldn't have a SubworkflowId yet", task.getSubWorkflowId());
         subWorkflowTaskId = task.getTaskId();
 
         workflowExecutor.executeSystemTask(subworkflow, task.getTaskId(), 1);