From a8ea39333492fd29bb35ab36e257a2b70bd9854b Mon Sep 17 00:00:00 2001 From: Rene Schneider Date: Tue, 3 May 2016 13:47:35 +0200 Subject: [PATCH] now really fixed #108: Possible NPE when using forks during test runtime Oops...my fault, was too damn sure about the previous fix to be working. Turned out it didn't. Now this one fixes it. --- .../de/gebit/integrity/remoting/entities/setlist/SetList.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de.gebit.integrity.remoting/src/de/gebit/integrity/remoting/entities/setlist/SetList.java b/de.gebit.integrity.remoting/src/de/gebit/integrity/remoting/entities/setlist/SetList.java index 7843e46db..9bdc7bde6 100644 --- a/de.gebit.integrity.remoting/src/de/gebit/integrity/remoting/entities/setlist/SetList.java +++ b/de.gebit.integrity.remoting/src/de/gebit/integrity/remoting/entities/setlist/SetList.java @@ -401,7 +401,7 @@ public void integrateUpdates(SetListEntry[] someUpdatedEntries) { // In case of tabletest results, also store their result in the result map, since we display those // results directly in the tree. See also issue #78, which was fixed by this. - if (tempEntryToUse.getType() == SetListEntryTypes.TABLETEST + if (resultBearingEntryResultMap != null && tempEntryToUse.getType() == SetListEntryTypes.TABLETEST && tempEntry.getType() == SetListEntryTypes.RESULT) { SetListEntryResultStates tempResultState = determineEntryResultState(tempEntry); if (tempResultState != null) {