Merge pull request #1574 from NASA-AMMOS/fix/ofnullable

NPE fix
NASA-AMMOS · Oct 3, 2024 · aff0fba · aff0fba
2 parents ac8720e + 697fe9a
commit aff0fba
Showing 1 changed file with 2 additions and 2 deletions.
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
@@ -828,7 +828,7 @@ public SimulationActivityExtract computeActivitySimulationResults(
                 .stream()
                 .map(spanToActivityInstanceId::get)
                 .toList(),
-            (activityParents.containsKey(span)) ? Optional.empty() : Optional.ofNullable(directiveId),
+            Optional.ofNullable(directiveId),
             outputAttributes
         ));
       } else {
@@ -843,7 +843,7 @@ public SimulationActivityExtract computeActivitySimulationResults(
                 .stream()
                 .map(spanToActivityInstanceId::get)
                 .toList(),
-            (activityParents.containsKey(span)) ? Optional.empty() : Optional.of(directiveId)
+            Optional.ofNullable(directiveId)
         ));
       }
     });