From 859d18b92408a916ac8857078e311c38e5737a27 Mon Sep 17 00:00:00 2001 From: Vincent Aravantinos <aravantinos@fortiss.org> Date: Wed, 27 Apr 2016 22:47:36 +0000 Subject: [PATCH] adds guard in cases fixes are null refs 2553 --- .../kernel/internal/ConstraintVerificationService.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/ConstraintVerificationService.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/ConstraintVerificationService.java index 5b4a298d5..2d4bd62bf 100644 --- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/ConstraintVerificationService.java +++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/ConstraintVerificationService.java @@ -37,7 +37,7 @@ import org.fortiss.tooling.kernel.utils.LoggingUtils; * @author aravantinos * @author $Author$ * @version $Rev$ - * @ConQAT.Rating YELLOW Hash: 1E06A3A4ED3DFC3F6DF9D4345FB29D7D + * @ConQAT.Rating YELLOW Hash: 3B08090E073A0A96815E002991A128A7 */ public final class ConstraintVerificationService extends EObjectAwareServiceBase<IConstraintVerifier<IConstraint>> implements @@ -59,13 +59,14 @@ public final class ConstraintVerificationService extends /** {@inheritDoc} */ @Override public List<IFix> fixes(IConstraintVerificationStatus status) { + List<IFix> fixes = null; if(status != null) { IConstraintVerifier<IConstraint> verifier = getFirstVerifier(status.getConstraint()); if(verifier != null) { - return verifier.fixes(status); + fixes = verifier.fixes(status); } } - return new ArrayList<IFix>(); + return fixes != null ? fixes : new ArrayList<IFix>(); } /** -- GitLab