fix(core): execution originalId can be null

kestra-io · Mar 8, 2023 · 9145ed4 · 9145ed4
1 parent a9dc5b6
commit 9145ed4
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/core/src/main/java/io/kestra/core/runners/RunContext.java b/core/src/main/java/io/kestra/core/runners/RunContext.java
@@ -223,12 +223,16 @@ protected Map<String, Object> variables(Flow flow, Task task, Execution executio
         }
 
         if (execution != null) {
+            ImmutableMap.Builder<String, Object> executionMap = ImmutableMap.<String, Object>builder()
+                .put("id", execution.getId())
+                .put("startDate", execution.getState().getStartDate());
+
+            if (execution.getOriginalId() != null) {
+                executionMap.put("originalId", execution.getOriginalId());
+            }
+
             builder
-                .put("execution", ImmutableMap.of(
-                    "id", execution.getId(),
-                    "originalId", execution.getOriginalId(),
-                    "startDate", execution.getState().getStartDate()
-                ));
+                .put("execution", executionMap.build());
 
             if (execution.getTaskRunList() != null) {
                 builder.put("outputs", execution.outputs());