Skip to content

Commit 8b2049a

Browse files
committed
fix(diag): avoid NullPointerExceptions
fix bug introduced by 2446135
1 parent b83f385 commit 8b2049a

File tree

1 file changed

+3
-3
lines changed
  • at.siemens.ct.jminizinc.diag/src/main/java/at/siemens/ct/jmz/diag

1 file changed

+3
-3
lines changed

at.siemens.ct.jminizinc.diag/src/main/java/at/siemens/ct/jmz/diag/FastDiag.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,10 @@ private List<Constraint> fd(List<Constraint> D, List<Constraint> C, List<Constra
9595

9696
stepNumber = indent(indent, innerIndex, stepNumber);
9797

98-
String displayConstraintListC = progressCalback.displayConstraintList(C);
98+
String displayConstraintListC = progressCalback == null ? null : progressCalback.displayConstraintList(C);
9999
if (displayfastDiagSteps && progressCalback != null && displayConstraintListC != null) {
100100
String displayConstraintListD = progressCalback.displayConstraintList(D);
101-
if (displayConstraintListD != null) {
101+
if (displayConstraintListC != null && displayConstraintListD != null) {
102102
String fdCall = String.format("%sCall FD with D: %s, C: %s", stepNumber, displayConstraintListD.trim(),
103103
displayConstraintListC.trim());
104104
progressCalback.displayMessage(fdCall);
@@ -108,7 +108,7 @@ private List<Constraint> fd(List<Constraint> D, List<Constraint> C, List<Constra
108108
boolean isConsistent = consistencyChecker.isConsistent(AC, fixedModel, mznFile);
109109
int q = C.size();
110110

111-
String displayConstraintListAC = progressCalback.displayConstraintList(AC);
111+
String displayConstraintListAC = progressCalback == null ? null : progressCalback.displayConstraintList(AC);
112112
if (!D.isEmpty()) {
113113
if (isConsistent) {
114114
if (displayfastDiagSteps && progressCalback != null) {

0 commit comments

Comments
 (0)