Merge branch 'import_dbdata'

java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/NationalityJsonDeserialzer.java

@@ -13,6 +13,9 @@ public class NationalityJsonDeserialzer implements JsonDeserializer<Nationality>
     @Override
     public Nationality deserialize(JSONObject object) throws JsonDeserializationException {
         String threeLetterIOCAcronym = (String) object.get(NationalityJsonSerializer.FIELD_IOC);
+        if (threeLetterIOCAcronym == null) {
+            return null;
+        }
         return new NationalityImpl(threeLetterIOCAcronym);
     }
     

java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/NationalityJsonSerializer.java

@@ -11,6 +11,9 @@ public class NationalityJsonSerializer implements JsonSerializer<Nationality> {
 
     @Override
     public JSONObject serialize(Nationality object) {
+        if (object == null) {
+            return null;
+        }
         JSONObject result = new JSONObject();
         result.put(FIELD_IOC, object.getThreeLetterIOCAcronym());
         return result;