From 4aebd93edfaa91bb6014d6ab3c09019d0a1ca42f Mon Sep 17 00:00:00 2001 From: Frank Mittag Date: Wed, 18 Apr 2018 11:58:51 +0200 Subject: [PATCH] fix for regatta.getAllBoats() for case where no raceDefinition can be found --- .../src/com/sap/sailing/domain/base/impl/RegattaImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/RegattaImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/RegattaImpl.java index e43126fd9f9..1b5176989f0 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/RegattaImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/RegattaImpl.java @@ -467,7 +467,9 @@ public class RegattaImpl extends NamedImpl implements Regatta, RaceColumnListene hasRaceColumns = true; for (final Fleet fleet : rc.getFleets()) { RaceDefinition raceDefinition = rc.getRaceDefinition(fleet); - Util.addAll(raceDefinition.getBoats(), result); + if (raceDefinition != null) { + Util.addAll(raceDefinition.getBoats(), result); + } } } final RegattaLog regattaLog = getRegattaLog();