Merge remote-tracking branch 'origin/master' into bug2610

This commit is contained in:
fmittag committed 2015-12-11 09:54:43 +01:00
commit f87332ea54
1 file changed
+2 -2
@@ -76,8 +76,8 @@ public abstract class AbstractSailingServerResource {
TrackedRace trackedRace = null;
if (regatta != null && race != null) {
DynamicTrackedRegatta trackedRegatta = getService().getTrackedRegatta(regatta);
if(trackedRegatta != null) {
trackedRace = trackedRegatta.getTrackedRace(race);
if (trackedRegatta != null) {
trackedRace = trackedRegatta.getExistingTrackedRace(race);
}
}
return trackedRace;