From 770b65da3a77ea0dff9ca271ee3766e1af33b7fc Mon Sep 17 00:00:00 2001
From: Simon Pamies <spamsch@gmail.com>
Date: Fri, 7 Sep 2018 21:12:42 +0200
Subject: [PATCH] Added null checks as value returned by JSON might be empty

---
 .../deserialization/impl/CompetitorJsonDeserializer.java | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/java/com.sap.sailing.server.gateway.serialization.shared.android/src/com/sap/sailing/server/gateway/deserialization/impl/CompetitorJsonDeserializer.java b/java/com.sap.sailing.server.gateway.serialization.shared.android/src/com/sap/sailing/server/gateway/deserialization/impl/CompetitorJsonDeserializer.java
index b98ced03999..12a735cf83a 100644
--- a/java/com.sap.sailing.server.gateway.serialization.shared.android/src/com/sap/sailing/server/gateway/deserialization/impl/CompetitorJsonDeserializer.java
+++ b/java/com.sap.sailing.server.gateway.serialization.shared.android/src/com/sap/sailing/server/gateway/deserialization/impl/CompetitorJsonDeserializer.java
@@ -82,9 +82,12 @@ public class CompetitorJsonDeserializer implements JsonDeserializer<DynamicCompe
                         CompetitorJsonConstants.FIELD_TEAM));
             }
             final DynamicBoat boat = getBoat(object, /* default ID */ competitorId);
-            final Double timeOnTimeFactor = ((Number) object.get(CompetitorJsonConstants.FIELD_TIME_ON_TIME_FACTOR)).doubleValue();
-            final Double timeOnDistanceAllowanceInSecondsPerNauticalMile = ((Number) object
-                    .get(CompetitorJsonConstants.FIELD_TIME_ON_DISTANCE_ALLOWANCE_IN_SECONDS_PER_NAUTICAL_MILE)).doubleValue();
+            final Number timeOnTimeFactorAsNumber = (Number) object.get(CompetitorJsonConstants.FIELD_TIME_ON_TIME_FACTOR);
+            final Double timeOnTimeFactor = timeOnTimeFactorAsNumber != null ? timeOnTimeFactorAsNumber.doubleValue() : 0.0;
+            final Number timeOnDistanceAllowanceInSecondsPerNauticalMileAsNumber = (Number) object
+                    .get(CompetitorJsonConstants.FIELD_TIME_ON_DISTANCE_ALLOWANCE_IN_SECONDS_PER_NAUTICAL_MILE);
+            final Double timeOnDistanceAllowanceInSecondsPerNauticalMile = timeOnDistanceAllowanceInSecondsPerNauticalMileAsNumber != null ? 
+            		timeOnDistanceAllowanceInSecondsPerNauticalMileAsNumber.doubleValue() : 0.0;
             final DynamicCompetitor result;
             if (boat == null) {
                 result = competitorWithBoatFactory.getOrCreateCompetitor(competitorId, name, shortName, displayColor, email,