Merge branch 'master' into axel-usermanagement

This commit is contained in:
Axel Uhl committed 2014-10-22 15:29:48 +02:00
commit 7cd94e0acb
1 file changed
+1 -1
@@ -149,7 +149,7 @@ public class RegattasResource extends AbstractSailingServerResource {
public Response getCompetitorPositions(@PathParam("regattaname") String regattaName, @PathParam("racename") String raceName,
@QueryParam("fromtime") String fromtime, @QueryParam("fromtimeasmillis") Long fromtimeasmillis,
@QueryParam("totime") String totime, @QueryParam("totimeasmillis") Long totimeasmillis, @QueryParam("withtack") Boolean withTack,
@QueryParam("competitorId") List<String> competitorIds) {
@QueryParam("competitorId") Set<String> competitorIds) {
Response response;
Regatta regatta = findRegattaByName(regattaName);
if (regatta == null) {