avoid duplicate RaceDefinition creation when pollClientParamsPHP and RaceCourseReceiver collide

java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/DomainFactory.java

@@ -179,25 +179,26 @@ public interface DomainFactory {
     /**
      * Creates a {@link RaceDefinition} from a TracTrac {@link Race} and a domain {@link Course} definition. The
      * resulting {@link RaceDefinition} is added to the {@link com.sap.sailing.domain.base.Regatta} to which
-     * <code>trackedRegatta</code> belongs (see {@link TrackedRegatta#getRegatta()}). It is added to the internal race cache.
-     * The corresponding {@link TrackedRace} object is also created, and the notification of threads waiting on the race
-     * cache such as a blocking {@link #getAndWaitForRaceDefinition(UUID)} happens only <em>after</em> the tracked race
-     * has been created and the {@link RaceDefinition} was
+     * <code>trackedRegatta</code> belongs (see {@link TrackedRegatta#getRegatta()}). It is added to the internal race
+     * cache. The corresponding {@link TrackedRace} object is also created, and the notification of threads waiting on
+     * the race cache such as a blocking {@link #getAndWaitForRaceDefinition(UUID)} happens only <em>after</em> the
+     * tracked race has been created and the {@link RaceDefinition} was
      * {@link com.sap.sailing.domain.base.Regatta#addRace(RaceDefinition) added} to the domain event. This ensures that
-     * waiters for the {@link RaceDefinition} are guaranteed to obtain a valid, non- <code>null</code> tracked race
+     * waiters for the {@link RaceDefinition} are guaranteed to obtain a valid, non-<code>null</code> tracked race
      * already immediately after the notification was sent, and that the {@link RaceDefinition} is already
      * {@link com.sap.sailing.domain.base.Regatta#getAllRaces() known} by its containing
      * {@link com.sap.sailing.domain.base.Regatta}.
-     * @param raceName TODO
-     * @param competitors TODO
-     * @param boatClass TODO
+     * 
      * @param raceDefinitionSetToUpdate
      *            if not <code>null</code>, after creating the {@link TrackedRace}, the {@link RaceDefinition} is
-     *            {@link DynamicRaceDefinitionSet#addRaceDefinition(RaceDefinition, DynamicTrackedRace) added} to that object.
+     *            {@link DynamicRaceDefinitionSet#addRaceDefinition(RaceDefinition, DynamicTrackedRace) added} to that
+     *            object.
      */
-    DynamicTrackedRace getOrCreateRaceDefinitionAndTrackedRace(TrackedRegatta trackedRegatta, UUID raceId,
-            String raceName, Iterable<com.sap.sailing.domain.base.Competitor> competitors, BoatClass boatClass, Course course, Iterable<Sideline> sidelines,
-            WindStore windStore, long delayToLiveInMillis, long millisecondsOverWhichToAverageWind, DynamicRaceDefinitionSet raceDefinitionSetToUpdate, URI courseDesignUpdateURI, UUID tracTracEventUuid, String tracTracUsername, String tracTracPassword);
+    DynamicTrackedRace getOrCreateRaceDefinitionAndTrackedRace(DynamicTrackedRegatta trackedRegatta, UUID raceId,
+            String raceName, Iterable<com.sap.sailing.domain.base.Competitor> competitors, BoatClass boatClass,
+            Course course, Iterable<Sideline> sidelines, WindStore windStore, long delayToLiveInMillis,
+            long millisecondsOverWhichToAverageWind, DynamicRaceDefinitionSet raceDefinitionSetToUpdate,
+            URI courseDesignUpdateURI, UUID tracTracEventUuid, String tracTracUsername, String tracTracPassword);
 
     /**
      * The record may be for a single mark or a gate. If for a gate, the

java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java

@@ -469,7 +469,7 @@ public class DomainFactoryImpl implements DomainFactory {
     }
 
     @Override
-    public DynamicTrackedRace getOrCreateRaceDefinitionAndTrackedRace(TrackedRegatta trackedRegatta, UUID raceId,
+    public DynamicTrackedRace getOrCreateRaceDefinitionAndTrackedRace(DynamicTrackedRegatta trackedRegatta, UUID raceId,
             String raceName, Iterable<Competitor> competitors, BoatClass boatClass, Course course,
             Iterable<Sideline> sidelines, WindStore windStore, long delayToLiveInMillis,
             long millisecondsOverWhichToAverageWind, DynamicRaceDefinitionSet raceDefinitionSetToUpdate,
@@ -479,33 +479,38 @@ public class DomainFactoryImpl implements DomainFactory {
             if (raceDefinition == null) {
                 logger.info("Creating RaceDefinitionImpl for race "+raceName);
                 raceDefinition = new RaceDefinitionImpl(raceName, course, boatClass, competitors, raceId);
+            } else {
+                logger.info("Already found RaceDefinitionImpl for race "+raceName);
+            }
+            DynamicTrackedRace trackedRace = trackedRegatta.getExistingTrackedRace(raceDefinition);
+            if (trackedRace == null) {
                 // add to existing regatta only if boat class matches
                 if (raceDefinition.getBoatClass() == trackedRegatta.getRegatta().getBoatClass()) {
                     trackedRegatta.getRegatta().addRace(raceDefinition);
-                    DynamicTrackedRace trackedRace = createTrackedRace(trackedRegatta, raceDefinition, sidelines, windStore,
+                    trackedRace = createTrackedRace(trackedRegatta, raceDefinition, sidelines, windStore,
                             delayToLiveInMillis, millisecondsOverWhichToAverageWind, raceDefinitionSetToUpdate);
-                    logger.info("Added race "+raceDefinition+" to regatta "+trackedRegatta.getRegatta());
-                    
-                    TracTracCourseDesignUpdateHandler courseDesignHandler = new TracTracCourseDesignUpdateHandler(tracTracUpdateURI,
-                            tracTracUsername, tracTracPassword,
-                            tracTracEventUuid, raceDefinition.getId());
+                    logger.info("Added race " + raceDefinition + " to regatta " + trackedRegatta.getRegatta());
+
+                    TracTracCourseDesignUpdateHandler courseDesignHandler = new TracTracCourseDesignUpdateHandler(
+                            tracTracUpdateURI, tracTracUsername, tracTracPassword, tracTracEventUuid,
+                            raceDefinition.getId());
                     trackedRace.addCourseDesignChangedListener(courseDesignHandler);
-                    
-                    TracTracStartTimeUpdateHandler startTimeHandler = new TracTracStartTimeUpdateHandler(tracTracUpdateURI, 
-                            tracTracUsername, tracTracPassword, tracTracEventUuid, raceDefinition.getId());
+
+                    TracTracStartTimeUpdateHandler startTimeHandler = new TracTracStartTimeUpdateHandler(
+                            tracTracUpdateURI, tracTracUsername, tracTracPassword, tracTracEventUuid,
+                            raceDefinition.getId());
                     trackedRace.addStartTimeChangedListener(startTimeHandler);
                     raceCache.put(raceId, raceDefinition);
                     raceCache.notifyAll();
-                    return trackedRace;
                 } else {
-                    logger.warning("Not adding race "+raceDefinition+" to regatta "+trackedRegatta.getRegatta()+
-                            " because boat class "+raceDefinition.getBoatClass()+" doesn't match regatta's boat class "+
-                            trackedRegatta.getRegatta().getBoatClass());
-                    return null;
+                    logger.warning("Not adding race " + raceDefinition + " to regatta " + trackedRegatta.getRegatta()
+                            + " because boat class " + raceDefinition.getBoatClass()
+                            + " doesn't match regatta's boat class " + trackedRegatta.getRegatta().getBoatClass());
                 }
             } else {
-                throw new RuntimeException("Race "+raceName+" already exists");
+                logger.info("Found existing tracked race for race "+raceName+" with ID "+raceId);
             }
+            return trackedRace;
         }
     }