Merge pull request #1586 from NASA-AMMOS/fix-analyze-mode

Fix analysis mode of scheduling engine
NASA-AMMOS · Nov 1, 2024 · 8118519 · 8118519
2 parents 524474c + 51562f6
commit 8118519
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/scheduler-driver/src/main/java/gov/nasa/jpl/aerie/scheduler/solver/PrioritySolver.java b/scheduler-driver/src/main/java/gov/nasa/jpl/aerie/scheduler/solver/PrioritySolver.java
@@ -491,8 +491,8 @@ private void satisfyGoalGeneral(Goal goal) throws SchedulingInterruptedException
       assert missing != null;
       logger.info("Processing conflict " + (++i));
       logger.info(missing.toString());
-      //determine the best activities to satisfy the conflict
-      ConflictSolverResult conflictSolverReturn = null;
+      //initialize conflict result to unsatisfied + no activities created
+      var conflictSolverReturn = new ConflictSolverResult();
       if (!analysisOnly && (missing instanceof MissingActivityInstanceConflict missingActivityInstanceConflict)) {
         conflictSolverReturn = solveActivityInstanceConflict(missingActivityInstanceConflict, goal);
       } else if (!analysisOnly && (missing instanceof MissingActivityTemplateConflict missingActivityTemplateConflict)) {