From 84e6a6d98f5858e482f3247b862b4875af055542 Mon Sep 17 00:00:00 2001
From: Axel Uhl <axel.uhl@sap.com>
Date: Tue, 4 Jun 2013 22:15:04 +0200
Subject: [PATCH] made detaching of a race log null safe

---
 .../sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java  | 4 +++-
 .../domain/tracking/impl/DynamicTrackedRaceLogListener.java   | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java
index b658309d6f4..bd81bb318d9 100755
--- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java
+++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java
@@ -670,7 +670,9 @@ DynamicTrackedRace, GPSTrackListener<Competitor, GPSFixMoving> {
     
     @Override
     public void detachRaceLog() {
-        logListener.removeFrom(attachedRaceLog);
+        if (attachedRaceLog != null) {
+            logListener.removeFrom(attachedRaceLog);
+        }
         super.detachRaceLog();
     }
 
diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceLogListener.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceLogListener.java
index f4f83a1e7ad..2676d8a4570 100644
--- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceLogListener.java
+++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceLogListener.java
@@ -49,7 +49,9 @@ public class DynamicTrackedRaceLogListener implements RaceLogEventVisitor {
         // Maybe something like this is needed:
         // TODO:
         // ??? trackedRace.setStatus(new TrackedRaceStatusImpl(TrackedRaceStatusEnum.PREPARED, 0.0));
-        raceLog.removeListener(this);
+        if (raceLog != null) {
+            raceLog.removeListener(this);
+        }
     }
 
     private void analyze() {