eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-11-14 22:43:57 +00:00
Code Activity

Fix NullPointerException when scanning deprecated device config

Browse Source
This commit is contained in:
Robert Benedikt committed 2019-03-14 10:57:29 +01:00
1 parent 80db232edf
commit 97fa96e53c
1 file changed
+8 -8
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.server.gateway.serialization.shared.android/src/com/sap/sailing/server/gateway/deserialization/impl/DeviceConfigurationJsonDeserializer.java
+8 -8
View File
@@ -1,12 +1,5 @@
package com.sap.sailing.server.gateway.deserialization.impl;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import org.json.simple.JSONArray;
import org.json.simple.JSONObject;
import com.sap.sailing.domain.base.configuration.DeviceConfiguration;
import com.sap.sailing.domain.base.configuration.RegattaConfiguration;
import com.sap.sailing.domain.base.configuration.impl.DeviceConfigurationImpl;
@@ -14,6 +7,13 @@ import com.sap.sailing.server.gateway.deserialization.JsonDeserializationExcepti
import com.sap.sailing.server.gateway.deserialization.JsonDeserializer;
import com.sap.sailing.server.gateway.serialization.impl.DeviceConfigurationJsonSerializer;
import org.json.simple.JSONArray;
import org.json.simple.JSONObject;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
public class DeviceConfigurationJsonDeserializer implements JsonDeserializer<DeviceConfiguration> {
public static DeviceConfigurationJsonDeserializer create() {
return new DeviceConfigurationJsonDeserializer(RegattaConfigurationJsonDeserializer.create());
@@ -30,7 +30,7 @@ public class DeviceConfigurationJsonDeserializer implements JsonDeserializer<Dev
RegattaConfiguration proceduresConfiguration = null;
final String name = (String) object.get(DeviceConfigurationJsonSerializer.FIELD_NAME);
final String idAsString = (String) object.get(DeviceConfigurationJsonSerializer.FIELD_ID_AS_STRING);
final UUID uuid = UUID.fromString(idAsString);
final UUID uuid = idAsString == null ? null : UUID.fromString(idAsString);
if (object.containsKey(DeviceConfigurationJsonSerializer.FIELD_REGATTA_CONFIGURATION)) {
JSONObject proceduresObject = Helpers.getNestedObjectSafe(object,
DeviceConfigurationJsonSerializer.FIELD_REGATTA_CONFIGURATION);