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

Merge branch 'master' into bug1018

Browse Source
This commit is contained in:
Axel Uhl committed 2015-05-23 12:00:31 +02:00
2 parents 92e0e2cc87 620a19ec10
commit 2cf3d90a81
1 file changed
+2 -1
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/racegroup/impl/RaceGroupDeserializer.java
+2 -1
View File
@@ -69,7 +69,8 @@ public class RaceGroupDeserializer implements JsonDeserializer<RaceGroup> {
configuration = configurationDeserializer.deserialize(value); configuration = configurationDeserializer.deserialize(value);
} }
if (object.containsKey(RaceGroupJsonSerializer.FIELD_DISPLAY_NAME)) { if (object.containsKey(RaceGroupJsonSerializer.FIELD_DISPLAY_NAME)) {
displayName = object.get(RaceGroupJsonSerializer.FIELD_DISPLAY_NAME).toString(); final Object displayNameJson = object.get(RaceGroupJsonSerializer.FIELD_DISPLAY_NAME);
displayName = displayNameJson == null ? null : displayNameJson.toString();
} }
return new RaceGroupImpl(name, displayName, boatClass, courseArea, series, configuration); return new RaceGroupImpl(name, displayName, boatClass, courseArea, series, configuration);
} }