File tree 1 file changed +2
-2
lines changed
scheduler-driver/src/main/java/gov/nasa/jpl/aerie/scheduler/solver
1 file changed +2
-2
lines changed Original file line number Diff line number Diff line change @@ -491,8 +491,8 @@ private void satisfyGoalGeneral(Goal goal) throws SchedulingInterruptedException
491
491
assert missing != null ;
492
492
logger .info ("Processing conflict " + (++i ));
493
493
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 () ;
496
496
if (!analysisOnly && (missing instanceof MissingActivityInstanceConflict missingActivityInstanceConflict )) {
497
497
conflictSolverReturn = solveActivityInstanceConflict (missingActivityInstanceConflict , goal );
498
498
} else if (!analysisOnly && (missing instanceof MissingActivityTemplateConflict missingActivityTemplateConflict )) {
You can’t perform that action at this time.
0 commit comments