From 3278e4dc5ef35f2bb4b921fc38b5593091e28320 Mon Sep 17 00:00:00 2001
From: Axel Uhl <axel.uhl@sap.com>
Date: Wed, 7 May 2014 10:23:25 +0200
Subject: [PATCH 01/10] wrote a release notes entry about the distance to line
 figure w.r.t the tracker position and the distance usually being a few meters
 too much

---
 java/com.sap.sailing.www/release_notes_analyze.html | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/java/com.sap.sailing.www/release_notes_analyze.html b/java/com.sap.sailing.www/release_notes_analyze.html
index 10a4ba85a29..b81d97c70a0 100644
--- a/java/com.sap.sailing.www/release_notes_analyze.html
+++ b/java/com.sap.sailing.www/release_notes_analyze.html
@@ -38,6 +38,12 @@
 					<h2 class="articleSubheadline">May 2014</h2>
 
 					<ul class="bulletList">
+						<li>A hint regarding the "distance to start line" metrics: please keep in mind that currently this
+						    measurement is calculated as the distance of the GPS tracker from the line. Unless the tracker
+						    is mounted near the bow (or at the bow sprit, if any), the distance calculated this way will
+						    be greater than what counts for crossing the line. Ordering, comparing and aggregating over this
+						    figure still makes sense as long as you remember this detail.
+						</li>
 						<li>Introduced a new leaderboard entry "XTE +/-" featuring a signed cross-track error which shows
 						    for a leg and also aggregated for an entire race on which side of the leg a competitor stayed on
 						    average. Currently, the "side" is defined as viewing in the leg's direction, so "left" for a downwind

From 16b57cdaf0f79138a4b919e38a21d9ea3d95eecf Mon Sep 17 00:00:00 2001
From: Axel Uhl <axel.uhl@sap.com>
Date: Wed, 7 May 2014 17:53:22 +0200
Subject: [PATCH 02/10] added Bundesliga 2013 to event list in index.html

---
 java/com.sap.sailing.www/index.html | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/java/com.sap.sailing.www/index.html b/java/com.sap.sailing.www/index.html
index ff86bbf4785..196f38a2866 100644
--- a/java/com.sap.sailing.www/index.html
+++ b/java/com.sap.sailing.www/index.html
@@ -95,7 +95,30 @@
                   <a href='http://www.extremesailingseries.com' target='_blank'>Official website</a>
                 </div>
               </div>
-             <div class='raceSection'>
+             
+              <div class='raceSection'>
+                <h5 class='date'>
+                  2013 Season
+                </h5>
+                <div class='raceTimepoint'></div>
+                <a href='http://bundesliga2013.sapsailing.com' target='_blank'>
+                  <ul class='racePanel'>
+                    <li class='raceName'>
+                      German Sailing League / Bundesliga 2013
+                    </li>
+                    <li class='raceLocation'>
+                      Germany
+                    </li>
+                   </ul>
+                </a>
+                <div class='raceDescription'>
+                  <p>German Sailing League / Bundesliga 2013</p>
+                  <a href='http://bundesliga2013.sapsailing.com' target='_blank'>SAP Sailing Analytics</a><br/>
+                  <a href='http://segelbundesliga.de' target='_blank'>Official website</a>
+                </div>
+              </div>
+
+              <div class='raceSection'>
                <h5 class='date'>
                  Sep 19-22
                </h5>
@@ -115,7 +138,7 @@
                  <a href='http://505idm2013.sapsailing.com' target='_blank'>SAP Sailing Analytics</a><br/>
                  <a href='http://505idm2013.de' target='_blank'>Official website</a>
                </div>
-             </div>
+              </div>
               <div class='raceSection'>
                 <h5 class='date'>
                   July 19 - 28

From ad4ce750c8677009e3183941a021b320aa67ed85 Mon Sep 17 00:00:00 2001
From: Axel Uhl <axel.uhl@sap.com>
Date: Wed, 7 May 2014 21:34:58 +0200
Subject: [PATCH 03/10] fixing bug 1945 (empty (null) color not allowed in
 competitor edit dialog); empty field means null

---
 .../gwt/ui/adminconsole/CompetitorEditDialog.java    | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CompetitorEditDialog.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CompetitorEditDialog.java
index 184c2746ac1..726746f055b 100755
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CompetitorEditDialog.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CompetitorEditDialog.java
@@ -132,10 +132,14 @@ public class CompetitorEditDialog extends DataEntryDialog<CompetitorDTO> {
     @Override
     protected CompetitorDTO getResult() {
         Color color;
-        try {
-            color = new RGBColor(displayColorTextBox.getText());
-        } catch (IllegalArgumentException iae) {
-            color = new InvalidColor(iae);
+        if (displayColorTextBox.getText() == null || displayColorTextBox.getText().isEmpty()) {
+            color = null;
+        } else {
+            try {
+                color = new RGBColor(displayColorTextBox.getText());
+            } catch (IllegalArgumentException iae) {
+                color = new InvalidColor(iae);
+            }
         }
         CompetitorDTO result = new CompetitorDTOImpl(name.getText(), color,
                 /* twoLetterIsoCountryCode */ null,

From 7ca425d4a2d1d4d8d6707c4e764cc4ae93715647 Mon Sep 17 00:00:00 2001
From: Axel Uhl <axel.uhl@sap.com>
Date: Wed, 7 May 2014 22:57:27 +0200
Subject: [PATCH 04/10] added observer pattern for Competitor, Team, Boat and
 Person

---
 .../domain/base/BoatChangeListener.java       |   5 +
 .../sap/sailing/domain/base/Competitor.java   |  13 ++
 .../domain/base/CompetitorChangeListener.java |   9 ++
 .../base/NationalityChangeListener.java       |   7 +
 .../sailing/domain/base/impl/BoatImpl.java    |  42 ++++-
 .../domain/base/impl/CompetitorImpl.java      |  54 ++++++-
 .../sailing/domain/base/impl/DynamicBoat.java |   6 +
 .../domain/base/impl/DynamicPerson.java       |   5 +
 .../sailing/domain/base/impl/DynamicTeam.java |   5 +
 .../sailing/domain/base/impl/PersonImpl.java  |  33 +++-
 .../sailing/domain/base/impl/TeamImpl.java    |  88 ++++++++++-
 .../domain/test/CompetitorListenerTest.java   | 144 ++++++++++++++++++
 .../DummyMarkPassingWithTimePointOnly.java    |   9 ++
 .../impl/TeamJsonDeserializer.java            |   3 +-
 .../server/test/MasterDataImportTest.java     |  35 +++--
 .../UpdateCompetitor.java                     |   4 +-
 16 files changed, 428 insertions(+), 34 deletions(-)
 create mode 100755 java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/BoatChangeListener.java
 create mode 100755 java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/CompetitorChangeListener.java
 create mode 100755 java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/NationalityChangeListener.java
 create mode 100755 java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CompetitorListenerTest.java

diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/BoatChangeListener.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/BoatChangeListener.java
new file mode 100755
index 00000000000..cc86744e89b
--- /dev/null
+++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/BoatChangeListener.java
@@ -0,0 +1,5 @@
+package com.sap.sailing.domain.base;
+
+public interface BoatChangeListener {
+    void sailIdChanged(String oldSailId, String newSailId);
+}
diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/Competitor.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/Competitor.java
index b078bf8162c..0a0d508cdc2 100644
--- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/Competitor.java
+++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/Competitor.java
@@ -10,4 +10,17 @@ public interface Competitor extends Named, WithID, IsManagedBySharedDomainFactor
     Boat getBoat();
     
     Color getColor();
+    
+    /**
+     * Adds a listener to this competitor. The listener is also added to the boat and the team for changes.
+     * Adding a listener that is already part of this competitor's listeners set remains without effect.
+     */
+    void addCompetitorChangeListener(CompetitorChangeListener listener);
+    
+    /**
+     * Removes a listener from this competitor. The listener is also removed from the boat and the team.
+     * Trying to remove a listener that is not currently in the set of this competitor's listener remains
+     * without effect.
+     */
+    void removeCompetitorChangeListener(CompetitorChangeListener listener);
 }
diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/CompetitorChangeListener.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/CompetitorChangeListener.java
new file mode 100755
index 00000000000..f5a0b722976
--- /dev/null
+++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/CompetitorChangeListener.java
@@ -0,0 +1,9 @@
+package com.sap.sailing.domain.base;
+
+import com.sap.sailing.domain.common.Color;
+
+public interface CompetitorChangeListener extends BoatChangeListener, NationalityChangeListener {
+    void colorChanged(Color oldColor, Color newColor);
+    
+    void nameChanged(String oldName, String newName);
+}
diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/NationalityChangeListener.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/NationalityChangeListener.java
new file mode 100755
index 00000000000..04171c3b454
--- /dev/null
+++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/NationalityChangeListener.java
@@ -0,0 +1,7 @@
+package com.sap.sailing.domain.base;
+
+import java.io.Serializable;
+
+public interface NationalityChangeListener extends Serializable {
+    void nationalityChanged(WithNationality what, Nationality oldNationality, Nationality newNationality);
+}
diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/BoatImpl.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/BoatImpl.java
index a16c72f28e1..1d9fc3bbb25 100644
--- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/BoatImpl.java
+++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/BoatImpl.java
@@ -1,17 +1,31 @@
 package com.sap.sailing.domain.base.impl;
 
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.util.HashSet;
+import java.util.Set;
+
+import com.sap.sailing.domain.base.BoatChangeListener;
 import com.sap.sailing.domain.base.BoatClass;
 import com.sap.sailing.domain.common.impl.NamedImpl;
+import com.sap.sailing.domain.common.impl.Util;
 
 public class BoatImpl extends NamedImpl implements DynamicBoat {
     private static final long serialVersionUID = 3489730487528955788L;
     private final BoatClass boatClass;
     private String sailID;
+    private transient Set<BoatChangeListener> listeners;
     
     public BoatImpl(String name, BoatClass boatClass, String sailID) {
         super(name);
         this.boatClass = boatClass;
         this.sailID = sailID;
+        this.listeners = new HashSet<BoatChangeListener>();
+    }
+    
+    private void readObject(ObjectInputStream ois) throws IOException, ClassNotFoundException {
+        ois.defaultReadObject();
+        listeners = new HashSet<BoatChangeListener>();
     }
 
     @Override
@@ -26,6 +40,32 @@ public class BoatImpl extends NamedImpl implements DynamicBoat {
 
     @Override
     public void setSailId(String newSailId) {
-        this.sailID = newSailId;
+        final String oldSailId = this.sailID;
+        if (!Util.equalsWithNull(oldSailId, newSailId)) {
+            this.sailID = newSailId;
+            for (BoatChangeListener listener : getListeners()) {
+                listener.sailIdChanged(oldSailId, newSailId);
+            }
+        }
+    }
+
+    @Override
+    public void addBoatChangeListener(BoatChangeListener listener) {
+        synchronized (listeners) {
+            listeners.add(listener);
+        }
+    }
+
+    @Override
+    public void removeCompetitorChangeListener(BoatChangeListener listener) {
+        synchronized (listeners) {
+            listeners.remove(listener);
+        }
+    }
+    
+    private Iterable<BoatChangeListener> getListeners() {
+        synchronized (listeners) {
+            return new HashSet<BoatChangeListener>(listeners);
+        }
     }
 }
diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/CompetitorImpl.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/CompetitorImpl.java
index 38ed945fc75..3426e4d22ac 100644
--- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/CompetitorImpl.java
+++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/CompetitorImpl.java
@@ -1,10 +1,16 @@
 package com.sap.sailing.domain.base.impl;
 
+import java.io.IOException;
+import java.io.ObjectInputStream;
 import java.io.Serializable;
+import java.util.HashSet;
+import java.util.Set;
 
 import com.sap.sailing.domain.base.Competitor;
+import com.sap.sailing.domain.base.CompetitorChangeListener;
 import com.sap.sailing.domain.base.SharedDomainFactory;
 import com.sap.sailing.domain.common.Color;
+import com.sap.sailing.domain.common.impl.Util;
 
 public class CompetitorImpl implements DynamicCompetitor {
     private static final long serialVersionUID = 294603681016643157L;
@@ -12,8 +18,8 @@ public class CompetitorImpl implements DynamicCompetitor {
     private final DynamicBoat boat;
     private final Serializable id;
     private String name;
-    
     private Color color;
+    private transient Set<CompetitorChangeListener> listeners;
     
     public CompetitorImpl(Serializable id, String name, Color color, DynamicTeam team, DynamicBoat boat) {
         this.id = id;
@@ -21,6 +27,12 @@ public class CompetitorImpl implements DynamicCompetitor {
         this.team = team;
         this.boat = boat;
         this.color = color;
+        this.listeners = new HashSet<CompetitorChangeListener>();
+    }
+    
+    private void readObject(ObjectInputStream ois) throws IOException, ClassNotFoundException {
+        ois.defaultReadObject();
+        listeners = new HashSet<CompetitorChangeListener>();
     }
 
     @Override
@@ -35,7 +47,13 @@ public class CompetitorImpl implements DynamicCompetitor {
     
     @Override
     public void setName(String newName) {
-        this.name = newName;
+        final String oldName = this.name;
+        if (!Util.equalsWithNull(oldName, newName)) {
+            this.name = newName;
+            for (CompetitorChangeListener listener : getListeners()) {
+                listener.nameChanged(oldName, newName);
+            }
+        }
     }
     
     @Override
@@ -64,6 +82,36 @@ public class CompetitorImpl implements DynamicCompetitor {
     }
 
     public void setColor(Color color) {
-        this.color = color;
+        final Color oldColor = this.color;
+        if (!Util.equalsWithNull(oldColor, color)) {
+            this.color = color;
+            for (CompetitorChangeListener listener : getListeners()) {
+                listener.colorChanged(oldColor, color);
+            }
+        }
+    }
+
+    @Override
+    public void addCompetitorChangeListener(CompetitorChangeListener listener) {
+        synchronized (listeners) {
+            listeners.add(listener);
+        }
+        getBoat().addBoatChangeListener(listener);
+        getTeam().addNationalityChangeListener(listener);
+    }
+
+    @Override
+    public void removeCompetitorChangeListener(CompetitorChangeListener listener) {
+        synchronized (listeners) {
+            listeners.remove(listener);
+        }
+        getBoat().removeCompetitorChangeListener(listener);
+        getTeam().removeNationalityChangeListener(listener);
+    }
+    
+    private Iterable<CompetitorChangeListener> getListeners() {
+        synchronized (listeners) {
+            return new HashSet<CompetitorChangeListener>(listeners);
+        }
     }
 }
diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/DynamicBoat.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/DynamicBoat.java
index 0b4e8f1e278..b3131fc9e4c 100755
--- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/DynamicBoat.java
+++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/DynamicBoat.java
@@ -1,7 +1,13 @@
 package com.sap.sailing.domain.base.impl;
 
 import com.sap.sailing.domain.base.Boat;
+import com.sap.sailing.domain.base.BoatChangeListener;
 
 public interface DynamicBoat extends Boat {
     void setSailId(String newSailId);
+
+    void addBoatChangeListener(BoatChangeListener listener);
+
+    void removeCompetitorChangeListener(BoatChangeListener listener);
+
 }
diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/DynamicPerson.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/DynamicPerson.java
index d5d13c3b45c..231192564e6 100755
--- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/DynamicPerson.java
+++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/DynamicPerson.java
@@ -1,8 +1,13 @@
 package com.sap.sailing.domain.base.impl;
 
 import com.sap.sailing.domain.base.Nationality;
+import com.sap.sailing.domain.base.NationalityChangeListener;
 import com.sap.sailing.domain.base.Person;
 
 public interface DynamicPerson extends Person {
     void setNationality(Nationality newNationality);
+    
+    void addNationalityChangeListener(NationalityChangeListener listener);
+    
+    void removeNationalityChangeListener(NationalityChangeListener listener);
 }
diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/DynamicTeam.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/DynamicTeam.java
index 807b159842a..fb0e14ba7a2 100755
--- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/DynamicTeam.java
+++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/DynamicTeam.java
@@ -1,8 +1,13 @@
 package com.sap.sailing.domain.base.impl;
 
 import com.sap.sailing.domain.base.Nationality;
+import com.sap.sailing.domain.base.NationalityChangeListener;
 import com.sap.sailing.domain.base.Team;
 
 public interface DynamicTeam extends Team {
     void setNationality(Nationality newNationality);
+
+    void addNationalityChangeListener(NationalityChangeListener listener);
+
+    void removeNationalityChangeListener(NationalityChangeListener listener);
 }
diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/PersonImpl.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/PersonImpl.java
index 48115fd27f7..7786f874509 100644
--- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/PersonImpl.java
+++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/PersonImpl.java
@@ -2,21 +2,27 @@ package com.sap.sailing.domain.base.impl;
 
 import java.io.InputStream;
 import java.util.Date;
+import java.util.HashSet;
+import java.util.Set;
 
 import com.sap.sailing.domain.base.Nationality;
+import com.sap.sailing.domain.base.NationalityChangeListener;
 import com.sap.sailing.domain.common.impl.NamedImpl;
+import com.sap.sailing.domain.common.impl.Util;
 
 public class PersonImpl extends NamedImpl implements DynamicPerson {
     private static final long serialVersionUID = -2104903799224233508L;
     private Nationality nationality;
     private final Date dateOfBirth;
     private final String description;
+    private transient Set<NationalityChangeListener> listeners;
     
     public PersonImpl(String name, Nationality nationality, Date dateOfBirth, String description) {
         super(name);
         this.nationality = nationality;
         this.dateOfBirth = dateOfBirth;
         this.description = description;
+        this.listeners = new HashSet<NationalityChangeListener>();
     }
 
     @Override
@@ -31,7 +37,13 @@ public class PersonImpl extends NamedImpl implements DynamicPerson {
     
     @Override
     public void setNationality(Nationality newNationality) {
-        this.nationality = newNationality;
+        final Nationality oldNationality = this.nationality;
+        if (!Util.equalsWithNull(oldNationality, newNationality)) {
+            this.nationality = newNationality;
+            for (NationalityChangeListener listener : getListeners()) {
+                listener.nationalityChanged(this, oldNationality, newNationality);
+            }
+        }
     }
 
     @Override
@@ -44,4 +56,23 @@ public class PersonImpl extends NamedImpl implements DynamicPerson {
         return description;
     }
 
+    @Override
+    public void addNationalityChangeListener(NationalityChangeListener listener) {
+        synchronized (listeners) {
+            listeners.add(listener);
+        }
+    }
+
+    @Override
+    public void removeNationalityChangeListener(NationalityChangeListener listener) {
+        synchronized (listeners) {
+            listeners.remove(listener);
+        }
+    }
+
+    private Iterable<NationalityChangeListener> getListeners() {
+        synchronized (listeners) {
+            return new HashSet<NationalityChangeListener>(listeners);
+        }
+    }
 }
diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/TeamImpl.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/TeamImpl.java
index d9332f79763..f2bb400b44e 100644
--- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/TeamImpl.java
+++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/TeamImpl.java
@@ -1,18 +1,80 @@
 package com.sap.sailing.domain.base.impl;
 
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.util.HashSet;
+import java.util.Set;
+
 import com.sap.sailing.domain.base.Nationality;
+import com.sap.sailing.domain.base.NationalityChangeListener;
 import com.sap.sailing.domain.base.Person;
+import com.sap.sailing.domain.base.WithNationality;
 import com.sap.sailing.domain.common.impl.NamedImpl;
+import com.sap.sailing.domain.common.impl.Util;
 
 public class TeamImpl extends NamedImpl implements DynamicTeam {
     private static final long serialVersionUID = 4646922280429210183L;
     private final Iterable<? extends DynamicPerson> sailors;
-    private final Person coach;
+    private final DynamicPerson coach;
+    private final NationalityChangeListener personNationalityChangeForwarder;
+    private transient Set<NationalityChangeListener> listeners;
     
-    public TeamImpl(String name, Iterable<? extends DynamicPerson> sailors, Person coach) {
+    public TeamImpl(String name, Iterable<? extends DynamicPerson> sailors, DynamicPerson coach) {
         super(name);
+        listeners = new HashSet<NationalityChangeListener>();
         this.sailors = sailors;
         this.coach = coach;
+        this.personNationalityChangeForwarder = new NationalityChangeListener() {
+            private static final long serialVersionUID = -6024941913105410444L;
+            @Override
+            public void nationalityChanged(WithNationality what, Nationality oldNationality, Nationality newNationality) {
+                if (what == getNationalityDonor()) {
+                    for (NationalityChangeListener listener : getNationalityChangeListeners()) {
+                        listener.nationalityChanged(TeamImpl.this, oldNationality, newNationality);
+                    }
+                }
+            }
+        };
+        setTransitiveListeners();
+    }
+
+    /**
+     * The listeners on {@link DynamicPerson} are transient. Our {@link #personNationalityChangeForwarder} needs to
+     * be restored after deserialization.
+     */
+    private void setTransitiveListeners() {
+        if (this.sailors != null) {
+            for (DynamicPerson sailor : this.sailors) {
+                sailor.addNationalityChangeListener(personNationalityChangeForwarder);
+            }
+        }
+        if (this.coach != null) {
+            this.coach.addNationalityChangeListener(personNationalityChangeForwarder);
+        }
+    }
+    
+    private void readObject(ObjectInputStream ois) throws IOException, ClassNotFoundException {
+        ois.defaultReadObject();
+        listeners = new HashSet<NationalityChangeListener>();
+        setTransitiveListeners();
+    }
+    
+    public void addNationalityChangeListener(NationalityChangeListener listener) {
+        synchronized (listeners) {
+            listeners.add(listener);
+        }
+    }
+    
+    public void removeNationalityChangeListener(NationalityChangeListener listener) {
+        synchronized (listeners) {
+            listeners.remove(listener);
+        }
+    }
+    
+    private Iterable<NationalityChangeListener> getNationalityChangeListeners() {
+        synchronized (listeners) {
+            return new HashSet<NationalityChangeListener>(listeners);
+        }
     }
 
     @Override
@@ -21,28 +83,38 @@ public class TeamImpl extends NamedImpl implements DynamicTeam {
     }
     
     @Override
-    public Person getCoach() {
+    public DynamicPerson getCoach() {
         return coach;
     }
 
     @Override
     public Nationality getNationality() {
+        return getNationalityDonor().getNationality();
+    }
+    
+    private WithNationality getNationalityDonor() {
         for (Person sailor : getSailors()) {
             if (sailor.getNationality() != null) {
-                return sailor.getNationality();
+                return sailor;
             }
         }
         if (getCoach() != null) {
-            return getCoach().getNationality();
+            return getCoach();
         }
         return null;
     }
 
     @Override
     public void setNationality(Nationality newNationality) {
-        for (Person sailor : getSailors()) {
-            ((DynamicPerson) sailor).setNationality(newNationality);
+        Nationality oldNationality = getNationality();
+        if (!Util.equalsWithNull(oldNationality, newNationality)) {
+            for (Person sailor : getSailors()) {
+                ((DynamicPerson) sailor).setNationality(newNationality);
+            }
+            for (NationalityChangeListener listener : getNationalityChangeListeners()) {
+                listener.nationalityChanged(this, oldNationality, newNationality);
+            }
         }
     }
-
+    
 }
diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CompetitorListenerTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CompetitorListenerTest.java
new file mode 100755
index 00000000000..42a5b278c87
--- /dev/null
+++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CompetitorListenerTest.java
@@ -0,0 +1,144 @@
+package com.sap.sailing.domain.test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import com.sap.sailing.domain.base.CompetitorChangeListener;
+import com.sap.sailing.domain.base.DomainFactory;
+import com.sap.sailing.domain.base.Nationality;
+import com.sap.sailing.domain.base.Team;
+import com.sap.sailing.domain.base.WithNationality;
+import com.sap.sailing.domain.base.impl.DynamicCompetitor;
+import com.sap.sailing.domain.common.Color;
+import com.sap.sailing.domain.common.impl.RGBColor;
+
+/**
+ * Tests the {@link CompetitorChangeListener} stuff including the serialization of the transitive listener
+ * pattern on the {@link Team} structure.
+ * 
+ * @author Axel Uhl (D043530)
+ *
+ */
+public class CompetitorListenerTest extends AbstractSerializationTest {
+    private CompetitorChangeListener listener;
+    private boolean nationalityChanged;
+    private Object whatChangedNationality;
+    private Object oldNationality;
+    private Object newNationality;
+    private boolean sailIdChanged;
+    private String oldSailId;
+    private String newSailId;
+    private boolean nameChanged;
+    private String oldName;
+    private String newName;
+    private boolean colorChanged;
+    private Color oldColor;
+    private Color newColor;
+    private DynamicCompetitor competitor;
+    
+    @Before
+    public void setUp() {
+        competitor = TrackBasedTest.createCompetitor("Hasso");
+        nationalityChanged = false;
+        whatChangedNationality = null;
+        oldNationality = null;
+        newNationality = null;
+        sailIdChanged = false;
+        oldSailId = null;
+        newSailId = null;
+        nameChanged = false;
+        oldName = null;
+        newName = null;
+        colorChanged = false;
+        oldColor = null;
+        newColor = null;
+        listener = new CompetitorChangeListener() {
+            private static final long serialVersionUID = 4581029778988240209L;
+
+            @Override
+            public void nationalityChanged(WithNationality what, Nationality oldNationality, Nationality newNationality) {
+                nationalityChanged = true;
+                whatChangedNationality = what;
+                CompetitorListenerTest.this.oldNationality = oldNationality;
+                CompetitorListenerTest.this.newNationality = newNationality;
+            }
+            
+            @Override
+            public void sailIdChanged(String oldSailId, String newSailId) {
+                sailIdChanged = true;
+                CompetitorListenerTest.this.oldSailId = oldSailId;
+                CompetitorListenerTest.this.newSailId = newSailId;
+            }
+            
+            @Override
+            public void nameChanged(String oldName, String newName) {
+                nameChanged = true;
+                CompetitorListenerTest.this.oldName = oldName;
+                CompetitorListenerTest.this.newName = newName;
+            }
+            
+            @Override
+            public void colorChanged(Color oldColor, Color newColor) {
+                colorChanged = true;
+                CompetitorListenerTest.this.oldColor = oldColor;
+                CompetitorListenerTest.this.newColor = newColor;
+            }
+        };
+        competitor.addCompetitorChangeListener(listener);
+    }
+    
+    @Test
+    public void testSimpleCompetitorListenerPatternForName() {
+        competitor.setName("Dr. Hasso Plattner");
+        assertTrue(nameChanged);
+        assertEquals("Hasso", oldName);
+        assertEquals("Dr. Hasso Plattner", newName);
+        assertFalse(sailIdChanged);
+        assertFalse(colorChanged);
+        assertFalse(nationalityChanged);
+    }
+
+    @Test
+    public void testSimpleCompetitorListenerPatternForSailId() {
+        final String myOldSailId = competitor.getBoat().getSailID();
+        competitor.getBoat().setSailId("POR 40");
+        assertFalse(nameChanged);
+        assertTrue(sailIdChanged);
+        assertEquals(myOldSailId, oldSailId);
+        assertEquals("POR 40", newSailId);
+        assertFalse(colorChanged);
+        assertFalse(nationalityChanged);
+    }
+
+    @Test
+    public void testSimpleCompetitorListenerPatternForColor() {
+        final Color myOldColor = competitor.getColor();
+        final RGBColor myNewColor = new RGBColor(123, 12, 234);
+        competitor.setColor(myNewColor);
+        assertFalse(nameChanged);
+        assertFalse(sailIdChanged);
+        assertTrue(colorChanged);
+        assertEquals(myOldColor, oldColor);
+        assertEquals(myNewColor, newColor);
+        assertFalse(nationalityChanged);
+    }
+
+    @Test
+    public void testSimpleCompetitorListenerPatternForNationality() {
+        final Nationality myOldNationality = competitor.getTeam().getNationality();
+        final Nationality myNewNationality = DomainFactory.INSTANCE.getOrCreateNationality("POR");
+        competitor.getTeam().setNationality(myNewNationality);
+        assertFalse(nameChanged);
+        assertFalse(sailIdChanged);
+        assertFalse(colorChanged);
+        assertTrue(nationalityChanged);
+        assertEquals(myOldNationality, oldNationality);
+        assertEquals(myNewNationality, newNationality);
+        assertSame(competitor.getTeam(), whatChangedNationality);
+    }
+}
diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DummyMarkPassingWithTimePointOnly.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DummyMarkPassingWithTimePointOnly.java
index 6a54a72d5ba..95e1b281fc7 100755
--- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DummyMarkPassingWithTimePointOnly.java
+++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DummyMarkPassingWithTimePointOnly.java
@@ -2,6 +2,7 @@ package com.sap.sailing.domain.tracking.impl;
 
 import com.sap.sailing.domain.base.Boat;
 import com.sap.sailing.domain.base.Competitor;
+import com.sap.sailing.domain.base.CompetitorChangeListener;
 import com.sap.sailing.domain.base.IsManagedBySharedDomainFactory;
 import com.sap.sailing.domain.base.SharedDomainFactory;
 import com.sap.sailing.domain.base.Team;
@@ -63,6 +64,14 @@ public class DummyMarkPassingWithTimePointOnly implements MarkPassing {
             public Color getColor() {
                 return null;
             }
+
+            @Override
+            public void addCompetitorChangeListener(CompetitorChangeListener listener) {
+            }
+
+            @Override
+            public void removeCompetitorChangeListener(CompetitorChangeListener listener) {
+            }
         };
     }
 }
diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/TeamJsonDeserializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/TeamJsonDeserializer.java
index afd30db343b..ed8d5f5ceb1 100644
--- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/TeamJsonDeserializer.java
+++ b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/TeamJsonDeserializer.java
@@ -6,7 +6,6 @@ import java.util.Set;
 import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
 
-import com.sap.sailing.domain.base.Person;
 import com.sap.sailing.domain.base.SharedDomainFactory;
 import com.sap.sailing.domain.base.impl.DynamicPerson;
 import com.sap.sailing.domain.base.impl.DynamicTeam;
@@ -32,7 +31,7 @@ public class TeamJsonDeserializer implements JsonDeserializer<DynamicTeam> {
 	public DynamicTeam deserialize(JSONObject object)
 			throws JsonDeserializationException {
 		String name = (String) object.get(TeamJsonSerializer.FIELD_NAME);
-		Person coach = personDeserializer.deserialize((JSONObject) object
+		DynamicPerson coach = personDeserializer.deserialize((JSONObject) object
 				.get(TeamJsonSerializer.FIELD_COACH));
 		Set<DynamicPerson> sailors = new HashSet<DynamicPerson>();
 
diff --git a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
index f7b7969fdde..d972a09c1a6 100755
--- a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
+++ b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
@@ -37,7 +37,6 @@ import com.sap.sailing.domain.base.CourseArea;
 import com.sap.sailing.domain.base.DomainFactory;
 import com.sap.sailing.domain.base.Event;
 import com.sap.sailing.domain.base.Fleet;
-import com.sap.sailing.domain.base.Person;
 import com.sap.sailing.domain.base.RaceColumn;
 import com.sap.sailing.domain.base.Regatta;
 import com.sap.sailing.domain.base.Series;
@@ -193,7 +192,7 @@ public class MasterDataImportTest {
         Set<DynamicPerson> sailors = new HashSet<DynamicPerson>();
         sailors.add(new PersonImpl("Froderik Poterson", new NationalityImpl("GER"), new Date(645487200000L),
                 "Oberhoschy"));
-        Person coach = new PersonImpl("Lennart Hensler", new NationalityImpl("GER"), new Date(645487200000L),
+        DynamicPerson coach = new PersonImpl("Lennart Hensler", new NationalityImpl("GER"), new Date(645487200000L),
                 "Der Lennart halt");
         DynamicTeam team = new TeamImpl("Pros", sailors, coach);
         BoatClass boatClass = new BoatClassImpl("H16", true);
@@ -204,7 +203,7 @@ public class MasterDataImportTest {
         Set<DynamicPerson> sailors2 = new HashSet<DynamicPerson>();
         sailors2.add(new PersonImpl("Angela Merkel", new NationalityImpl("GER"), new Date(645487200000L),
                 "segelt auch mit"));
-        Person coach2 = new PersonImpl("Peer Steinbrueck", new NationalityImpl("GER"), new Date(645487200000L),
+        DynamicPerson coach2 = new PersonImpl("Peer Steinbrueck", new NationalityImpl("GER"), new Date(645487200000L),
                 "Bester Coach");
         DynamicTeam team2 = new TeamImpl("Noobs", sailors2, coach2);
         DynamicBoat boat2 = new BoatImpl("LahmeEnte", boatClass, "GER1337");
@@ -402,7 +401,7 @@ public class MasterDataImportTest {
         Set<DynamicPerson> sailors = new HashSet<DynamicPerson>();
         sailors.add(new PersonImpl("Froderik Poterson", new NationalityImpl("GER"), new Date(645487200000L),
                 "Oberhoschy"));
-        Person coach = new PersonImpl("Lennart Hensler", new NationalityImpl("GER"), new Date(645487200000L),
+        DynamicPerson coach = new PersonImpl("Lennart Hensler", new NationalityImpl("GER"), new Date(645487200000L),
                 "Der Lennart halt");
         DynamicTeam team = new TeamImpl("Pros", sailors, coach);
         BoatClass boatClass = new BoatClassImpl("H16", true);
@@ -412,7 +411,7 @@ public class MasterDataImportTest {
         UUID competitor2UUID = UUID.randomUUID();
         Set<DynamicPerson> sailors2 = new HashSet<DynamicPerson>();
         sailors2.add(new PersonImpl("Test Mustermann", new NationalityImpl("GER"), new Date(645487200000L), "desc"));
-        Person coach2 = new PersonImpl("Max Test", new NationalityImpl("GER"), new Date(645487200000L), "desc");
+        DynamicPerson coach2 = new PersonImpl("Max Test", new NationalityImpl("GER"), new Date(645487200000L), "desc");
         DynamicTeam team2 = new TeamImpl("Pros2", sailors2, coach2);
         DynamicBoat boat2 = new BoatImpl("FastBoat", boatClass, "GER70133");
         CompetitorImpl competitor2 = new CompetitorImpl(competitor2UUID, "Froderik", Color.RED, team2, boat2);
@@ -678,7 +677,7 @@ public class MasterDataImportTest {
         Set<DynamicPerson> sailors = new HashSet<DynamicPerson>();
         sailors.add(new PersonImpl("Froderik Poterson", new NationalityImpl("GER"), new Date(645487200000L),
                 "Oberhoschy"));
-        Person coach = new PersonImpl("Lennart Hensler", new NationalityImpl("GER"), new Date(645487200000L),
+        DynamicPerson coach = new PersonImpl("Lennart Hensler", new NationalityImpl("GER"), new Date(645487200000L),
                 "Der Lennart halt");
         DynamicTeam team = new TeamImpl("Pros", sailors, coach);
         BoatClass boatClass = new BoatClassImpl("H16", true);
@@ -689,7 +688,7 @@ public class MasterDataImportTest {
         UUID competitor2UUID = UUID.randomUUID();
         Set<DynamicPerson> sailors2 = new HashSet<DynamicPerson>();
         sailors2.add(new PersonImpl("Test Mustermann", new NationalityImpl("GER"), new Date(645487200000L), "desc"));
-        Person coach2 = new PersonImpl("Max Test", new NationalityImpl("GER"), new Date(645487200000L), "desc");
+        DynamicPerson coach2 = new PersonImpl("Max Test", new NationalityImpl("GER"), new Date(645487200000L), "desc");
         DynamicTeam team2 = new TeamImpl("Pros2", sailors2, coach2);
         DynamicBoat boat2 = new BoatImpl("FastBoat", boatClass, "GER70133");
         Competitor competitor2 = sourceDomainFactory.getCompetitorStore().getOrCreateCompetitor(competitor2UUID,
@@ -833,7 +832,7 @@ public class MasterDataImportTest {
         Set<DynamicPerson> sailors = new HashSet<DynamicPerson>();
         sailors.add(new PersonImpl("Froderik Poterson", new NationalityImpl("GER"), new Date(645487200000L),
                 "Oberhoschy"));
-        Person coach = new PersonImpl("Lennart Hensler", new NationalityImpl("GER"), new Date(645487200000L),
+        DynamicPerson coach = new PersonImpl("Lennart Hensler", new NationalityImpl("GER"), new Date(645487200000L),
                 "Der Lennart halt");
         DynamicTeam team = new TeamImpl("Pros", sailors, coach);
         BoatClass boatClass = new BoatClassImpl("H16", true);
@@ -844,7 +843,7 @@ public class MasterDataImportTest {
         Set<DynamicPerson> sailors2 = new HashSet<DynamicPerson>();
         sailors2.add(new PersonImpl("Angela Merkel", new NationalityImpl("GER"), new Date(645487200000L),
                 "segelt auch mit"));
-        Person coach2 = new PersonImpl("Peer Steinbrueck", new NationalityImpl("GER"), new Date(645487200000L),
+        DynamicPerson coach2 = new PersonImpl("Peer Steinbrueck", new NationalityImpl("GER"), new Date(645487200000L),
                 "Bester Coach");
         DynamicTeam team2 = new TeamImpl("Noobs", sailors2, coach2);
         DynamicBoat boat2 = new BoatImpl("LahmeEnte", boatClass, "GER1337");
@@ -1029,7 +1028,7 @@ public class MasterDataImportTest {
         Set<DynamicPerson> sailors = new HashSet<DynamicPerson>();
         sailors.add(new PersonImpl("Froderik Poterson", new NationalityImpl("GER"), new Date(645487200000L),
                 "Oberhoschy"));
-        Person coach = new PersonImpl("Lennart Hensler", new NationalityImpl("GER"), new Date(645487200000L),
+        DynamicPerson coach = new PersonImpl("Lennart Hensler", new NationalityImpl("GER"), new Date(645487200000L),
                 "Der Lennart halt");
         DynamicTeam team = new TeamImpl("Pros", sailors, coach);
         BoatClass boatClass = new BoatClassImpl("H16", true);
@@ -1040,7 +1039,7 @@ public class MasterDataImportTest {
         Set<DynamicPerson> sailors2 = new HashSet<DynamicPerson>();
         sailors2.add(new PersonImpl("Angela Merkel", new NationalityImpl("GER"), new Date(645487200000L),
                 "segelt auch mit"));
-        Person coach2 = new PersonImpl("Peer Steinbrueck", new NationalityImpl("GER"), new Date(645487200000L),
+        DynamicPerson coach2 = new PersonImpl("Peer Steinbrueck", new NationalityImpl("GER"), new Date(645487200000L),
                 "Bester Coach");
         DynamicTeam team2 = new TeamImpl("Noobs", sailors2, coach2);
         DynamicBoat boat2 = new BoatImpl("LahmeEnte", boatClass, "GER1337");
@@ -1127,7 +1126,7 @@ public class MasterDataImportTest {
             Set<DynamicPerson> sailorsToOverride = new HashSet<DynamicPerson>();
             sailorsToOverride.add(new PersonImpl("Froderik Poterson", new NationalityImpl("GER"), new Date(
                     645487200000L), "Oberhoschy"));
-            Person coachToOverride = new PersonImpl("Lennart Hensler", new NationalityImpl("GER"), new Date(
+            DynamicPerson coachToOverride = new PersonImpl("Lennart Hensler", new NationalityImpl("GER"), new Date(
                     645487200000L), "Der Lennart halt");
             DynamicTeam teamToOverride = new TeamImpl("Pros", sailorsToOverride, coachToOverride);
             BoatClass boatClassToOverride = new BoatClassImpl("H16", true);
@@ -1298,7 +1297,7 @@ public class MasterDataImportTest {
         Set<DynamicPerson> sailors = new HashSet<DynamicPerson>();
         sailors.add(new PersonImpl("Froderik Poterson", new NationalityImpl("GER"), new Date(645487200000L),
                 "Oberhoschy"));
-        Person coach = new PersonImpl("Lennart Hensler", new NationalityImpl("GER"), new Date(645487200000L),
+        DynamicPerson coach = new PersonImpl("Lennart Hensler", new NationalityImpl("GER"), new Date(645487200000L),
                 "Der Lennart halt");
         DynamicTeam team = new TeamImpl("Pros", sailors, coach);
         BoatClass boatClass = new BoatClassImpl("H16", true);
@@ -1309,7 +1308,7 @@ public class MasterDataImportTest {
         Set<DynamicPerson> sailors2 = new HashSet<DynamicPerson>();
         sailors2.add(new PersonImpl("Angela Merkel", new NationalityImpl("GER"), new Date(645487200000L),
                 "segelt auch mit"));
-        Person coach2 = new PersonImpl("Peer Steinbrueck", new NationalityImpl("GER"), new Date(645487200000L),
+        DynamicPerson coach2 = new PersonImpl("Peer Steinbrueck", new NationalityImpl("GER"), new Date(645487200000L),
                 "Bester Coach");
         DynamicTeam team2 = new TeamImpl("Noobs", sailors2, coach2);
         DynamicBoat boat2 = new BoatImpl("LahmeEnte", boatClass, "GER1337");
@@ -1431,7 +1430,7 @@ public class MasterDataImportTest {
         Set<DynamicPerson> sailors = new HashSet<DynamicPerson>();
         sailors.add(new PersonImpl("Froderik Poterson", new NationalityImpl("GER"), new Date(645487200000L),
                 "Oberhoschy"));
-        Person coach = new PersonImpl("Lennart Hensler", new NationalityImpl("GER"), new Date(645487200000L),
+        DynamicPerson coach = new PersonImpl("Lennart Hensler", new NationalityImpl("GER"), new Date(645487200000L),
                 "Der Lennart halt");
         DynamicTeam team = new TeamImpl("Pros", sailors, coach);
         BoatClass boatClass = new BoatClassImpl("H16", true);
@@ -1442,7 +1441,7 @@ public class MasterDataImportTest {
         Set<DynamicPerson> sailors2 = new HashSet<DynamicPerson>();
         sailors2.add(new PersonImpl("Angela Merkel", new NationalityImpl("GER"), new Date(645487200000L),
                 "segelt auch mit"));
-        Person coach2 = new PersonImpl("Peer Steinbrueck", new NationalityImpl("GER"), new Date(645487200000L),
+        DynamicPerson coach2 = new PersonImpl("Peer Steinbrueck", new NationalityImpl("GER"), new Date(645487200000L),
                 "Bester Coach");
         DynamicTeam team2 = new TeamImpl("Noobs", sailors2, coach2);
         DynamicBoat boat2 = new BoatImpl("LahmeEnte", boatClass, "GER1337");
@@ -1638,7 +1637,7 @@ public class MasterDataImportTest {
         Set<DynamicPerson> sailors = new HashSet<DynamicPerson>();
         sailors.add(new PersonImpl("Froderik Poterson", new NationalityImpl("GER"), new Date(645487200000L),
                 "Oberhoschy"));
-        Person coach = new PersonImpl("Lennart Hensler", new NationalityImpl("GER"), new Date(645487200000L),
+        DynamicPerson coach = new PersonImpl("Lennart Hensler", new NationalityImpl("GER"), new Date(645487200000L),
                 "Der Lennart halt");
         DynamicTeam team = new TeamImpl("Pros", sailors, coach);
         BoatClass boatClass = new BoatClassImpl("H16", true);
@@ -1649,7 +1648,7 @@ public class MasterDataImportTest {
         Set<DynamicPerson> sailors2 = new HashSet<DynamicPerson>();
         sailors2.add(new PersonImpl("Angela Merkel", new NationalityImpl("GER"), new Date(645487200000L),
                 "segelt auch mit"));
-        Person coach2 = new PersonImpl("Peer Steinbrueck", new NationalityImpl("GER"), new Date(645487200000L),
+        DynamicPerson coach2 = new PersonImpl("Peer Steinbrueck", new NationalityImpl("GER"), new Date(645487200000L),
                 "Bester Coach");
         DynamicTeam team2 = new TeamImpl("Noobs", sailors2, coach2);
         DynamicBoat boat2 = new BoatImpl("LahmeEnte", boatClass, "GER1337");
diff --git a/java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/UpdateCompetitor.java b/java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/UpdateCompetitor.java
index 01c236ff0d8..4938413b5bb 100755
--- a/java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/UpdateCompetitor.java
+++ b/java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/UpdateCompetitor.java
@@ -29,7 +29,9 @@ public class UpdateCompetitor extends AbstractRacingEventServiceOperation<Compet
 
     @Override
     public Competitor internalApplyTo(RacingEventService toState) throws Exception {
-        return toState.getBaseDomainFactory().getCompetitorStore().updateCompetitor(idAsString, newName, newDisplayColor, newSailId, newNationality);
+        Competitor result = toState.getBaseDomainFactory().getCompetitorStore()
+                .updateCompetitor(idAsString, newName, newDisplayColor, newSailId, newNationality);
+        return result;
     }
 
     @Override

From dc688e857ec942ae6df3d09ef8317424ac222c7c Mon Sep 17 00:00:00 2001
From: Axel Uhl <axel.uhl@sap.com>
Date: Wed, 7 May 2014 23:08:25 +0200
Subject: [PATCH 05/10] added tests for competitor change listener / observer
 pattern in conjunction with serialization

---
 .../sailing/domain/base/impl/PersonImpl.java  |  7 +++
 .../domain/test/CompetitorListenerTest.java   | 53 +++++++++++++++++++
 2 files changed, 60 insertions(+)

diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/PersonImpl.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/PersonImpl.java
index 7786f874509..87297b31df3 100644
--- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/PersonImpl.java
+++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/PersonImpl.java
@@ -1,6 +1,8 @@
 package com.sap.sailing.domain.base.impl;
 
+import java.io.IOException;
 import java.io.InputStream;
+import java.io.ObjectInputStream;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
@@ -25,6 +27,11 @@ public class PersonImpl extends NamedImpl implements DynamicPerson {
         this.listeners = new HashSet<NationalityChangeListener>();
     }
 
+    private void readObject(ObjectInputStream ois) throws IOException, ClassNotFoundException {
+        ois.defaultReadObject();
+        listeners = new HashSet<NationalityChangeListener>();
+    }
+    
     @Override
     public InputStream getImage() {
         throw new UnsupportedOperationException("Image for person not yet implemented");
diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CompetitorListenerTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CompetitorListenerTest.java
index 42a5b278c87..08741bc72b1 100755
--- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CompetitorListenerTest.java
+++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CompetitorListenerTest.java
@@ -5,6 +5,8 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
+import java.io.IOException;
+
 import org.junit.Before;
 import org.junit.Test;
 
@@ -13,6 +15,7 @@ import com.sap.sailing.domain.base.DomainFactory;
 import com.sap.sailing.domain.base.Nationality;
 import com.sap.sailing.domain.base.Team;
 import com.sap.sailing.domain.base.WithNationality;
+import com.sap.sailing.domain.base.impl.DomainFactoryImpl;
 import com.sap.sailing.domain.base.impl.DynamicCompetitor;
 import com.sap.sailing.domain.common.Color;
 import com.sap.sailing.domain.common.impl.RGBColor;
@@ -40,9 +43,11 @@ public class CompetitorListenerTest extends AbstractSerializationTest {
     private Color oldColor;
     private Color newColor;
     private DynamicCompetitor competitor;
+    private DomainFactoryImpl baseDomainFactory;
     
     @Before
     public void setUp() {
+        baseDomainFactory = new DomainFactoryImpl();
         competitor = TrackBasedTest.createCompetitor("Hasso");
         nationalityChanged = false;
         whatChangedNationality = null;
@@ -141,4 +146,52 @@ public class CompetitorListenerTest extends AbstractSerializationTest {
         assertEquals(myNewNationality, newNationality);
         assertSame(competitor.getTeam(), whatChangedNationality);
     }
+    
+    @Test
+    public void testCompetitorSerializationLosesAllExternalListeners() throws ClassNotFoundException, IOException {
+        DomainFactory baseDomainFactory = new DomainFactoryImpl();
+        DynamicCompetitor clonedCompetitor = cloneBySerialization(competitor, baseDomainFactory);
+        clonedCompetitor.setName("Dr. Hasso Plattner");
+        clonedCompetitor.getBoat().setSailId("POR 40");
+        final RGBColor myNewColor = new RGBColor(123, 12, 234);
+        clonedCompetitor.setColor(myNewColor);
+        final Nationality myNewNationality = baseDomainFactory.getOrCreateNationality("POR");
+        clonedCompetitor.getTeam().setNationality(myNewNationality);
+        assertFalse(nameChanged);
+        assertFalse(sailIdChanged);
+        assertFalse(colorChanged);
+        assertFalse(nationalityChanged);
+    }
+
+    @Test
+    public void testCompetitorSerializationListenerPatternForNameOnSerializedCompetitor() throws ClassNotFoundException, IOException {
+        DynamicCompetitor clonedCompetitor = cloneBySerialization(competitor, baseDomainFactory);
+        competitor = clonedCompetitor;
+        competitor.addCompetitorChangeListener(listener);
+        testSimpleCompetitorListenerPatternForName();
+    }
+
+    @Test
+    public void testCompetitorSerializationListenerPatternForColorOnSerializedCompetitor() throws ClassNotFoundException, IOException {
+        DynamicCompetitor clonedCompetitor = cloneBySerialization(competitor, baseDomainFactory);
+        competitor = clonedCompetitor;
+        competitor.addCompetitorChangeListener(listener);
+        testSimpleCompetitorListenerPatternForColor();
+    }
+    
+    @Test
+    public void testCompetitorSerializationListenerPatternForSailIdOnSerializedCompetitor() throws ClassNotFoundException, IOException {
+        DynamicCompetitor clonedCompetitor = cloneBySerialization(competitor, baseDomainFactory);
+        competitor = clonedCompetitor;
+        competitor.addCompetitorChangeListener(listener);
+        testSimpleCompetitorListenerPatternForSailId();
+    }
+    
+    @Test
+    public void testCompetitorSerializationListenerPatternForNationalityOnSerializedCompetitor() throws ClassNotFoundException, IOException {
+        DynamicCompetitor clonedCompetitor = cloneBySerialization(competitor, baseDomainFactory);
+        competitor = clonedCompetitor;
+        competitor.addCompetitorChangeListener(listener);
+        testSimpleCompetitorListenerPatternForNationality();
+    }
 }

From 48cb36ab607c00c930e55975e868685e5d1977ee Mon Sep 17 00:00:00 2001
From: Axel Uhl <axel.uhl@sap.com>
Date: Wed, 7 May 2014 23:42:23 +0200
Subject: [PATCH 06/10] apply competitor listener pattern to leaderboard
 caching infrastructure; competitor change will invalidate leaderboard cache

---
 .../leaderboard/LeaderboardCacheManager.java  | 87 ++++++++++++++++---
 1 file changed, 77 insertions(+), 10 deletions(-)

diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/LeaderboardCacheManager.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/LeaderboardCacheManager.java
index 4e92d3e1f1c..8a3c41541ad 100755
--- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/LeaderboardCacheManager.java
+++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/LeaderboardCacheManager.java
@@ -7,11 +7,15 @@ import java.util.Set;
 import java.util.WeakHashMap;
 
 import com.sap.sailing.domain.base.Competitor;
+import com.sap.sailing.domain.base.CompetitorChangeListener;
 import com.sap.sailing.domain.base.Fleet;
 import com.sap.sailing.domain.base.Mark;
+import com.sap.sailing.domain.base.Nationality;
 import com.sap.sailing.domain.base.RaceColumn;
 import com.sap.sailing.domain.base.RaceColumnListener;
 import com.sap.sailing.domain.base.Waypoint;
+import com.sap.sailing.domain.base.WithNationality;
+import com.sap.sailing.domain.common.Color;
 import com.sap.sailing.domain.common.MaxPointsReason;
 import com.sap.sailing.domain.common.TimePoint;
 import com.sap.sailing.domain.common.WindSource;
@@ -39,7 +43,8 @@ import com.sap.sailing.util.impl.NamedReentrantReadWriteLock;
  */
 public class LeaderboardCacheManager {
     private final WeakHashMap<Leaderboard, CacheInvalidationUponScoreCorrectionListener> scoreCorrectionListeners;
-    private final NamedReentrantReadWriteLock scoreCorrectionListenersLock;
+    private final NamedReentrantReadWriteLock scoreCorrectionAndCompetitorChangeListenersLock;
+    private final WeakHashMap<Leaderboard, CacheInvalidationUponCompetitorChangeListener> competitorChangeListeners;
     private final WeakHashMap<Leaderboard, Map<TrackedRace, Set<CacheInvalidationListener>>> invalidationListenersPerLeaderboard;
     private final WeakHashMap<Leaderboard, RaceColumnListener> raceColumnListeners;
     
@@ -113,6 +118,53 @@ public class LeaderboardCacheManager {
         }
     }
     
+    private class CacheInvalidationUponCompetitorChangeListener implements CompetitorChangeListener {
+        private static final long serialVersionUID = 8308312509904366143L;
+        private final Leaderboard leaderboard;
+        private final Set<Competitor> observedCompetitors;
+        
+        public CacheInvalidationUponCompetitorChangeListener(Leaderboard leaderboard) {
+            this.leaderboard = leaderboard;
+            observedCompetitors = new HashSet<>();
+        }
+
+        @Override
+        public void sailIdChanged(String oldSailId, String newSailId) {
+            removeFromCache(leaderboard);
+        }
+
+        @Override
+        public void nationalityChanged(WithNationality what, Nationality oldNationality, Nationality newNationality) {
+            removeFromCache(leaderboard);
+        }
+
+        @Override
+        public void colorChanged(Color oldColor, Color newColor) {
+            removeFromCache(leaderboard);
+        }
+
+        @Override
+        public void nameChanged(String oldName, String newName) {
+            removeFromCache(leaderboard);
+        }
+
+        public synchronized void updateCompetitorListeners() {
+            Set<Competitor> competitorsToStopObserving = new HashSet<>(observedCompetitors);
+            for (Competitor competitor : leaderboard.getCompetitors()) {
+                if (!observedCompetitors.contains(competitor)) {
+                    competitor.addCompetitorChangeListener(this); // start observing competitor
+                } else {
+                    competitorsToStopObserving.remove(competitor); // keep observing competitor
+                }
+            }
+            for (Competitor competitorToStopObserving : competitorsToStopObserving) {
+                competitorToStopObserving.removeCompetitorChangeListener(this);
+                observedCompetitors.remove(competitorToStopObserving);
+            }
+        }
+        
+    }
+    
     private class CacheInvalidationUponScoreCorrectionListener implements ScoreCorrectionListener {
         private final Leaderboard leaderboard;
         
@@ -146,10 +198,12 @@ public class LeaderboardCacheManager {
     
     public LeaderboardCacheManager(LeaderboardCache leaderboardCache) {
         this.leaderboardCache = leaderboardCache;
-        this.invalidationListenersPerLeaderboard = new WeakHashMap<Leaderboard, Map<TrackedRace, Set<CacheInvalidationListener>>>();
+        this.invalidationListenersPerLeaderboard = new WeakHashMap<>();
         this.raceColumnListeners = new WeakHashMap<Leaderboard, RaceColumnListener>();
-        this.scoreCorrectionListeners = new WeakHashMap<Leaderboard, CacheInvalidationUponScoreCorrectionListener>();
-        this.scoreCorrectionListenersLock = new NamedReentrantReadWriteLock("Score correction listeners", /* fair */ false);
+        this.scoreCorrectionListeners = new WeakHashMap<>();
+        this.scoreCorrectionAndCompetitorChangeListenersLock = new NamedReentrantReadWriteLock(
+                "Score correction and competitor change listeners", /* fair */false);
+        this.competitorChangeListeners = new WeakHashMap<>();
     }
     
     private void removeFromCache(Leaderboard leaderboard) {
@@ -167,14 +221,19 @@ public class LeaderboardCacheManager {
         synchronized (raceColumnListeners) {
             leaderboard.removeRaceColumnListener(raceColumnListeners.remove(leaderboard));
         }
-        LockUtil.lockForWrite(scoreCorrectionListenersLock);
+        LockUtil.lockForWrite(scoreCorrectionAndCompetitorChangeListenersLock);
         final CacheInvalidationUponScoreCorrectionListener removedScoreCorrectionListener;
+        final CacheInvalidationUponCompetitorChangeListener removedCompetitorChangeListener;
         try {
             removedScoreCorrectionListener = scoreCorrectionListeners.remove(leaderboard);
+            removedCompetitorChangeListener = competitorChangeListeners.remove(leaderboard);
         } finally {
-            LockUtil.unlockAfterWrite(scoreCorrectionListenersLock);
+            LockUtil.unlockAfterWrite(scoreCorrectionAndCompetitorChangeListenersLock);
         }
         leaderboard.getScoreCorrection().removeScoreCorrectionListener(removedScoreCorrectionListener);
+        for (Competitor competitor : leaderboard.getCompetitors()) {
+            competitor.removeCompetitorChangeListener(removedCompetitorChangeListener);
+        }
         // invalidate after the listeners have been removed; this is important because invalidation may trigger a
         // re-calculation which then in turn may call add(leaderboard) asynchronously again which may be executed
         // before the listener removal happens here. This could lead to a race condition where listeners are
@@ -195,22 +254,28 @@ public class LeaderboardCacheManager {
     private void registerAsListener(final Leaderboard leaderboard) {
         // only add as listener again if not yet added
         final boolean containsKey;
-        LockUtil.lockForRead(scoreCorrectionListenersLock);
+        LockUtil.lockForRead(scoreCorrectionAndCompetitorChangeListenersLock);
         try {
             containsKey = scoreCorrectionListeners.containsKey(leaderboard);
         } finally {
-            LockUtil.unlockAfterRead(scoreCorrectionListenersLock);
+            LockUtil.unlockAfterRead(scoreCorrectionAndCompetitorChangeListenersLock);
         }
         if (!containsKey) {
-            LockUtil.lockForWrite(scoreCorrectionListenersLock);
+            LockUtil.lockForWrite(scoreCorrectionAndCompetitorChangeListenersLock);
             try {
                 for (TrackedRace trackedRace : leaderboard.getTrackedRaces()) {
                     registerListener(leaderboard, trackedRace);
                 }
                 final CacheInvalidationUponScoreCorrectionListener scoreCorrectionListener = new CacheInvalidationUponScoreCorrectionListener(
                         leaderboard);
+                final CacheInvalidationUponCompetitorChangeListener competitorChangeListener = new CacheInvalidationUponCompetitorChangeListener(
+                        leaderboard);
                 leaderboard.getScoreCorrection().addScoreCorrectionListener(scoreCorrectionListener);
+                for (Competitor competitor : leaderboard.getCompetitors()) {
+                    competitor.addCompetitorChangeListener(competitorChangeListener);
+                }
                 scoreCorrectionListeners.put(leaderboard, scoreCorrectionListener);
+                competitorChangeListeners.put(leaderboard, competitorChangeListener);
                 final RaceColumnListener raceColumnListener = new RaceColumnListener() {
                     private static final long serialVersionUID = 8165124797028386317L;
 
@@ -218,6 +283,7 @@ public class LeaderboardCacheManager {
                     public void trackedRaceLinked(RaceColumn raceColumn, Fleet fleet, TrackedRace trackedRace) {
                         removeFromCache(leaderboard);
                         registerListener(leaderboard, trackedRace);
+                        competitorChangeListeners.get(leaderboard).updateCompetitorListeners();
                     }
 
                     /**
@@ -231,6 +297,7 @@ public class LeaderboardCacheManager {
                     @Override
                     public void trackedRaceUnlinked(RaceColumn raceColumn, Fleet fleet, TrackedRace trackedRace) {
                         removeFromCache(leaderboard);
+                        competitorChangeListeners.get(leaderboard).updateCompetitorListeners();
                         Map<TrackedRace, Set<CacheInvalidationListener>> listenersMap = invalidationListenersPerLeaderboard
                                 .get(leaderboard);
                         if (listenersMap != null) {
@@ -312,7 +379,7 @@ public class LeaderboardCacheManager {
                     raceColumnListeners.put(leaderboard, raceColumnListener);
                 }
             } finally {
-                LockUtil.unlockAfterWrite(scoreCorrectionListenersLock);
+                LockUtil.unlockAfterWrite(scoreCorrectionAndCompetitorChangeListenersLock);
             }
         }
     }

From e0f0cfd556f17b58ef07c8542f0df36ccf5040bc Mon Sep 17 00:00:00 2001
From: Axel Uhl <axel.uhl@sap.com>
Date: Wed, 7 May 2014 23:52:54 +0200
Subject: [PATCH 07/10] unified how the leaderboard cache manager's competitor
 change listener is applied to the leaderboard's competitors

---
 .../domain/leaderboard/LeaderboardCacheManager.java       | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/LeaderboardCacheManager.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/LeaderboardCacheManager.java
index 8a3c41541ad..49c4ee19640 100755
--- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/LeaderboardCacheManager.java
+++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/LeaderboardCacheManager.java
@@ -123,9 +123,14 @@ public class LeaderboardCacheManager {
         private final Leaderboard leaderboard;
         private final Set<Competitor> observedCompetitors;
         
+        /**
+         * Registers this listener as listener for all of the <code>leaderboard</code>'s current
+         * {@link Leaderboard#getCompetitors() competitors}
+         */
         public CacheInvalidationUponCompetitorChangeListener(Leaderboard leaderboard) {
             this.leaderboard = leaderboard;
             observedCompetitors = new HashSet<>();
+            updateCompetitorListeners();
         }
 
         @Override
@@ -271,9 +276,6 @@ public class LeaderboardCacheManager {
                 final CacheInvalidationUponCompetitorChangeListener competitorChangeListener = new CacheInvalidationUponCompetitorChangeListener(
                         leaderboard);
                 leaderboard.getScoreCorrection().addScoreCorrectionListener(scoreCorrectionListener);
-                for (Competitor competitor : leaderboard.getCompetitors()) {
-                    competitor.addCompetitorChangeListener(competitorChangeListener);
-                }
                 scoreCorrectionListeners.put(leaderboard, scoreCorrectionListener);
                 competitorChangeListeners.put(leaderboard, competitorChangeListener);
                 final RaceColumnListener raceColumnListener = new RaceColumnListener() {

From 1dd02519a39f8c661c025eeb2bca3d2279a43e23 Mon Sep 17 00:00:00 2001
From: Axel Uhl <axel.uhl@sap.com>
Date: Thu, 8 May 2014 00:04:09 +0200
Subject: [PATCH 08/10] fixed de-registration of competitor listener in
 leaderboard cache manager

---
 .../domain/leaderboard/LeaderboardCacheManager.java  | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/LeaderboardCacheManager.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/LeaderboardCacheManager.java
index 49c4ee19640..fe94d5a44fe 100755
--- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/LeaderboardCacheManager.java
+++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/LeaderboardCacheManager.java
@@ -167,6 +167,12 @@ public class LeaderboardCacheManager {
                 observedCompetitors.remove(competitorToStopObserving);
             }
         }
+
+        public synchronized void removeFromAllCompetitors() {
+            for (Competitor competitor : observedCompetitors) {
+                competitor.removeCompetitorChangeListener(this);
+            }
+        }
         
     }
     
@@ -236,9 +242,7 @@ public class LeaderboardCacheManager {
             LockUtil.unlockAfterWrite(scoreCorrectionAndCompetitorChangeListenersLock);
         }
         leaderboard.getScoreCorrection().removeScoreCorrectionListener(removedScoreCorrectionListener);
-        for (Competitor competitor : leaderboard.getCompetitors()) {
-            competitor.removeCompetitorChangeListener(removedCompetitorChangeListener);
-        }
+        removedCompetitorChangeListener.removeFromAllCompetitors();
         // invalidate after the listeners have been removed; this is important because invalidation may trigger a
         // re-calculation which then in turn may call add(leaderboard) asynchronously again which may be executed
         // before the listener removal happens here. This could lead to a race condition where listeners are
@@ -283,9 +287,9 @@ public class LeaderboardCacheManager {
 
                     @Override
                     public void trackedRaceLinked(RaceColumn raceColumn, Fleet fleet, TrackedRace trackedRace) {
+                        competitorChangeListeners.get(leaderboard).updateCompetitorListeners();
                         removeFromCache(leaderboard);
                         registerListener(leaderboard, trackedRace);
-                        competitorChangeListeners.get(leaderboard).updateCompetitorListeners();
                     }
 
                     /**

From 57b0f4b98ddf597eea34139083940be869fedd82 Mon Sep 17 00:00:00 2001
From: Axel Uhl <axel.uhl@sap.com>
Date: Thu, 8 May 2014 00:16:55 +0200
Subject: [PATCH 09/10] let de-registration of competitor change listener get
 done by removeFromCache

---
 .../domain/leaderboard/LeaderboardCacheManager.java   | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/LeaderboardCacheManager.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/LeaderboardCacheManager.java
index fe94d5a44fe..73a85a4a827 100755
--- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/LeaderboardCacheManager.java
+++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/LeaderboardCacheManager.java
@@ -241,8 +241,12 @@ public class LeaderboardCacheManager {
         } finally {
             LockUtil.unlockAfterWrite(scoreCorrectionAndCompetitorChangeListenersLock);
         }
-        leaderboard.getScoreCorrection().removeScoreCorrectionListener(removedScoreCorrectionListener);
-        removedCompetitorChangeListener.removeFromAllCompetitors();
+        if (removedScoreCorrectionListener != null) {
+            leaderboard.getScoreCorrection().removeScoreCorrectionListener(removedScoreCorrectionListener);
+        }
+        if (removedCompetitorChangeListener != null) {
+            removedCompetitorChangeListener.removeFromAllCompetitors();
+        }
         // invalidate after the listeners have been removed; this is important because invalidation may trigger a
         // re-calculation which then in turn may call add(leaderboard) asynchronously again which may be executed
         // before the listener removal happens here. This could lead to a race condition where listeners are
@@ -287,7 +291,6 @@ public class LeaderboardCacheManager {
 
                     @Override
                     public void trackedRaceLinked(RaceColumn raceColumn, Fleet fleet, TrackedRace trackedRace) {
-                        competitorChangeListeners.get(leaderboard).updateCompetitorListeners();
                         removeFromCache(leaderboard);
                         registerListener(leaderboard, trackedRace);
                     }
@@ -302,8 +305,8 @@ public class LeaderboardCacheManager {
 
                     @Override
                     public void trackedRaceUnlinked(RaceColumn raceColumn, Fleet fleet, TrackedRace trackedRace) {
-                        removeFromCache(leaderboard);
                         competitorChangeListeners.get(leaderboard).updateCompetitorListeners();
+                        removeFromCache(leaderboard);
                         Map<TrackedRace, Set<CacheInvalidationListener>> listenersMap = invalidationListenersPerLeaderboard
                                 .get(leaderboard);
                         if (listenersMap != null) {

From 929353267fb078986ba073535f01ff2f3ea118ba Mon Sep 17 00:00:00 2001
From: Axel Uhl <axel.uhl@sap.com>
Date: Thu, 8 May 2014 00:25:26 +0200
Subject: [PATCH 10/10] at another place, let removeFromCache do the
 unregistration of competitor observers

---
 .../sap/sailing/domain/leaderboard/LeaderboardCacheManager.java  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/LeaderboardCacheManager.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/LeaderboardCacheManager.java
index 73a85a4a827..a9db6d4d6a9 100755
--- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/LeaderboardCacheManager.java
+++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/LeaderboardCacheManager.java
@@ -305,7 +305,6 @@ public class LeaderboardCacheManager {
 
                     @Override
                     public void trackedRaceUnlinked(RaceColumn raceColumn, Fleet fleet, TrackedRace trackedRace) {
-                        competitorChangeListeners.get(leaderboard).updateCompetitorListeners();
                         removeFromCache(leaderboard);
                         Map<TrackedRace, Set<CacheInvalidationListener>> listenersMap = invalidationListenersPerLeaderboard
                                 .get(leaderboard);