From 145065904ce9f5162d8bd264ea939cfdcaed356c Mon Sep 17 00:00:00 2001 From: Vladislav Chumak Date: Fri, 30 Mar 2018 16:40:21 +0200 Subject: [PATCH] Bugfix for JsonSerializer for complete maneuver curves with estimation data --- .../CompleteManeuverCurvesWithEstimationDataJsonSerializer.java | 2 +- .../sap/sailing/server/gateway/jaxrs/api/RegattasResource.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/CompleteManeuverCurvesWithEstimationDataJsonSerializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/CompleteManeuverCurvesWithEstimationDataJsonSerializer.java index 5abce07e555..0afc15d6512 100644 --- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/CompleteManeuverCurvesWithEstimationDataJsonSerializer.java +++ b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/CompleteManeuverCurvesWithEstimationDataJsonSerializer.java @@ -49,7 +49,7 @@ public class CompleteManeuverCurvesWithEstimationDataJsonSerializer extends Abst } forCompetitorJson.put(MANEUVER_CURVES, completeManeuverCurvesWithEstimationData); Duration averageIntervalBetweenFixes = trackedRace.getTrack(competitor).getAverageIntervalBetweenFixes(); - forCompetitorJson.put(AVG_INTERVAL_BETWEEN_FIXES_IN_SECONDS, averageIntervalBetweenFixes.asSeconds()); + forCompetitorJson.put(AVG_INTERVAL_BETWEEN_FIXES_IN_SECONDS, averageIntervalBetweenFixes == null ? 0 : averageIntervalBetweenFixes.asSeconds()); } return result; } diff --git a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RegattasResource.java b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RegattasResource.java index 89471c227e7..5008f8b8bf3 100644 --- a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RegattasResource.java +++ b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RegattasResource.java @@ -1028,7 +1028,7 @@ public class RegattasResource extends AbstractSailingServerResource { @GET @Produces("application/json;charset=UTF-8") @Path("{regattaname}/races/{racename}/completeManeuverCurvesWithEstimationData") - public Response getManeuversWithEstimationData(@PathParam("regattaname") String regattaName, + public Response getCompleteManeuverCurvesWithEstimationData(@PathParam("regattaname") String regattaName, @PathParam("racename") String raceName) { Response response; Regatta regatta = findRegattaByName(regattaName);