From f65350326a345355be7d3897ddd01d79e4dd3a4f Mon Sep 17 00:00:00 2001 From: Fredrik Teschke Date: Mon, 19 May 2014 00:09:55 +0200 Subject: [PATCH] fix NullPointerE in first check if mappings were already loaded --- .../domain/racelogtracking/impl/RaceLogRaceTracker.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/RaceLogRaceTracker.java b/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/RaceLogRaceTracker.java index 90e8a67bb5f..00d5065aa3c 100644 --- a/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/RaceLogRaceTracker.java +++ b/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/RaceLogRaceTracker.java @@ -213,6 +213,9 @@ public class RaceLogRaceTracker extends BaseRaceLogEventVisitor implements RaceT private boolean hasMappingAlreadyBeenLoaded( DeviceMapping newMapping, List> oldMappings) { + if (oldMappings == null) { + return false; + } for (DeviceMapping oldMapping : oldMappings) { if (newMapping.getDevice() == oldMapping.getDevice() && newMapping.getTimeRange().liesWithin(oldMapping.getTimeRange())) {