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
+1 -1
@@ -77,7 +77,7 @@ public abstract class AbstractSailingServerResource {
if (regatta != null && race != null) {
DynamicTrackedRegatta trackedRegatta = getService().getTrackedRegatta(regatta);
if (trackedRegatta != null) {
trackedRace = trackedRegatta.getTrackedRace(race);
trackedRace = trackedRegatta.getExistingTrackedRace(race);
}
}
return trackedRace;