Merge branch 'v0.15.x_bugfix' into v0.15.x

integrity-tf · May 3, 2016 · d9ffb70 · d9ffb70
2 parents b239376 + a8ea393
commit d9ffb70
Showing 1 changed file with 1 addition and 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
@@ -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) {