NPE fix

NASA-AMMOS · Oct 2, 2024 · b979aed · b979aed
1 parent b4cc768
commit b979aed
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/merlin-driver/src/main/java/gov/nasa/jpl/aerie/merlin/driver/engine/SimulationEngine.java b/merlin-driver/src/main/java/gov/nasa/jpl/aerie/merlin/driver/engine/SimulationEngine.java
@@ -843,7 +843,7 @@ public SimulationActivityExtract computeActivitySimulationResults(
                 .stream()
                 .map(spanToActivityInstanceId::get)
                 .toList(),
-            (activityParents.containsKey(span)) ? Optional.empty() : Optional.of(directiveId)
+            (activityParents.containsKey(span)) ? Optional.empty() : Optional.ofNullable(directiveId)
         ));
       }
     });