Merge branch 'master' into bug4811-with-bug5288

This commit is contained in:
Axel Uhl committed 2021-01-15 18:51:00 +01:00
commit 1b3c1cddf1
1 file changed
+8 -2
@@ -7,6 +7,7 @@ import java.net.URISyntaxException;
import java.net.URL;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
@@ -578,12 +579,17 @@ public class DomainFactoryImpl implements DomainFactory {
IRaceSubscriber raceSubscriber, boolean useInternalMarkPassingAlgorithm, long timeoutInMilliseconds,
RaceTrackingHandler raceTrackingHandler,
RaceAndCompetitorStatusWithRaceLogReconciler raceAndCompetitorStatusWithRaceLogReconciler) {
final List<ReceiverType> receiverTypes = new ArrayList<>();
receiverTypes.addAll(Arrays.asList(ReceiverType.RACECOURSE, ReceiverType.MARKPASSINGS, ReceiverType.MARKPOSITIONS, ReceiverType.RACESTARTFINISH,
ReceiverType.RAWPOSITIONS, ReceiverType.SENSORDATA));
if (raceAndCompetitorStatusWithRaceLogReconciler != null) {
receiverTypes.add(ReceiverType.COMPETITOR);
}
return getUpdateReceivers(trackedRegatta, tractracRace, windStore, delayToLiveInMillis, simulator,
raceDefinitionSetToUpdate, trackedRegattaRegistry, raceLogResolver, leaderboardGroupResolver, courseDesignUpdateURI,
tracTracUsername, tracTracPassword, eventSubscriber, raceSubscriber,
useInternalMarkPassingAlgorithm, timeoutInMilliseconds, raceTrackingHandler, raceAndCompetitorStatusWithRaceLogReconciler,
ReceiverType.RACECOURSE, ReceiverType.MARKPASSINGS, ReceiverType.MARKPOSITIONS, ReceiverType.RACESTARTFINISH,
ReceiverType.RAWPOSITIONS, ReceiverType.SENSORDATA, ReceiverType.COMPETITOR);
receiverTypes.toArray(new ReceiverType[receiverTypes.size()]));
}
@Override