Update WorkflowExecutor.java

Netflix · Dec 1, 2023 · 83c6e1d · 83c6e1d
1 parent 1e1ac46
commit 83c6e1d
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/java-sdk/src/main/java/com/netflix/conductor/sdk/workflow/executor/WorkflowExecutor.java b/java-sdk/src/main/java/com/netflix/conductor/sdk/workflow/executor/WorkflowExecutor.java
@@ -155,32 +155,34 @@ public void initWorkers(String packagesToScan) {
     }
 
     private String startWorkflow(String name, Integer version, WorkflowDef workflowDef, Object input) {
-        CompletableFuture<Workflow> future = new CompletableFuture<>();
         Map<String, Object> inputMap = objectMapper.convertValue(input, Map.class);
 
         StartWorkflowRequest request = new StartWorkflowRequest();
         request.setInput(inputMap);
         request.setName(name);
         request.setVersion(version);
-        request.setWorkflowDef(conductorWorkflow.toWorkflowDef());
+        request.setWorkflowDef(workflowDef);
 
         return workflowClient.startWorkflow(request);
     }
 
     public String executeWorkflowFuture(String name, Integer version, Object input) {
-        String workflowId = this.startWorkflow(name, version, input);
+        String workflowId = this.startWorkflow(name, version, null, input);
+        CompletableFuture<Workflow> future = new CompletableFuture<>();
         runningWorkflowFutures.put(workflowId, future);
         return workflowId;
     }
 
     public CompletableFuture<Workflow> executeWorkflow(String name, Integer version, Object input) {
-        String workflowId = this.startWorkflow(name, version, input);
+        String workflowId = this.startWorkflow(name, version, null, input);
+        CompletableFuture<Workflow> future = new CompletableFuture<>();
         runningWorkflowFutures.put(workflowId, future);
         return future;
     }
 
     public CompletableFuture<Workflow> executeWorkflow(ConductorWorkflow conductorWorkflow, Object input) {
         String workflowId = this.startWorkflow(conductorWorkflow.getName(), conductorWorkflow.getVersion(), conductorWorkflow.toWorkflowDef(), input);
+        CompletableFuture<Workflow> future = new CompletableFuture<>();
         runningWorkflowFutures.put(workflowId, future);
         return future;
     }