From 65f3bf6ccd133fd07d4f5de58b6411096239ffc5 Mon Sep 17 00:00:00 2001
From: Steffen Schaefer <steffen.schaefer@sap.com>
Date: Mon, 9 Jul 2018 10:49:51 +0200
Subject: [PATCH] Bug 4663: prevent NPE in FixLoaderAndTracker due to bad
 timing

---
 .../racelogtracking/impl/fixtracker/FixLoaderAndTracker.java   | 3 ++-
 .../impl/fixtracker/RegattaLogDeviceMappings.java              | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/fixtracker/FixLoaderAndTracker.java b/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/fixtracker/FixLoaderAndTracker.java
index b1baf2b4f61..32e38f5afd9 100755
--- a/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/fixtracker/FixLoaderAndTracker.java
+++ b/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/fixtracker/FixLoaderAndTracker.java
@@ -619,9 +619,10 @@ public class FixLoaderAndTracker implements TrackingDataLoader {
 
     private void startTracking() {
         setStatusAndProgress(TrackedRaceStatusEnum.TRACKING, 0.0);
-        trackedRace.addListener(raceChangeListener);
         this.deviceMappings = new FixLoaderDeviceMappings(trackedRace.getAttachedRegattaLogs(),
                 trackedRace.getRace().getName());
+        trackedRace.addListener(raceChangeListener);
+        this.deviceMappings.updateMappings();
     }
 
     private void loadFixesForExtendedTimeRange(final TimeRange extendedTimeRange) {
diff --git a/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/fixtracker/RegattaLogDeviceMappings.java b/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/fixtracker/RegattaLogDeviceMappings.java
index bcf7c25dc7c..9ccc123f26d 100644
--- a/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/fixtracker/RegattaLogDeviceMappings.java
+++ b/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/fixtracker/RegattaLogDeviceMappings.java
@@ -146,7 +146,7 @@ public abstract class RegattaLogDeviceMappings<ItemT extends WithID> {
         });
     }
     
-    private void updateMappings() {
+    public void updateMappings() {
         try {
             updateMappingsInternal();
         } catch (Exception e) {