Skip to content

Commit 8118519

Browse files
authored
Merge pull request #1586 from NASA-AMMOS/fix-analyze-mode
Fix analysis mode of scheduling engine
2 parents 524474c + 51562f6 commit 8118519

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

scheduler-driver/src/main/java/gov/nasa/jpl/aerie/scheduler/solver/PrioritySolver.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -491,8 +491,8 @@ private void satisfyGoalGeneral(Goal goal) throws SchedulingInterruptedException
491491
assert missing != null;
492492
logger.info("Processing conflict " + (++i));
493493
logger.info(missing.toString());
494-
//determine the best activities to satisfy the conflict
495-
ConflictSolverResult conflictSolverReturn = null;
494+
//initialize conflict result to unsatisfied + no activities created
495+
var conflictSolverReturn = new ConflictSolverResult();
496496
if (!analysisOnly && (missing instanceof MissingActivityInstanceConflict missingActivityInstanceConflict)) {
497497
conflictSolverReturn = solveActivityInstanceConflict(missingActivityInstanceConflict, goal);
498498
} else if (!analysisOnly && (missing instanceof MissingActivityTemplateConflict missingActivityTemplateConflict)) {

0 commit comments

Comments
 (0)