From f119326f307635dddc6306d4f5a4e349e808b48a Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Wed, 6 May 2015 23:33:12 +1200 Subject: Display markers on the map --- src/org/traccar/http/JsonConverter.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/org/traccar/http/JsonConverter.java') diff --git a/src/org/traccar/http/JsonConverter.java b/src/org/traccar/http/JsonConverter.java index 48fd934b7..0802fb9ea 100644 --- a/src/org/traccar/http/JsonConverter.java +++ b/src/org/traccar/http/JsonConverter.java @@ -93,9 +93,15 @@ public class JsonConverter { } else if (method.getReturnType().equals(double.class)) { json.add(name, (Double) method.invoke(object)); } else if (method.getReturnType().equals(String.class)) { - json.add(name, (String) method.invoke(object)); + String value = (String) method.invoke(object); + if (value != null) { + json.add(name, value); + } } else if (method.getReturnType().equals(Date.class)) { - json.add(name, dateFormat.format((Date) method.invoke(object))); + Date value = (Date) method.invoke(object); + if (value != null) { + json.add(name, dateFormat.format(value)); + } } } catch (IllegalAccessException error) { } catch (InvocationTargetException error) { -- cgit v1.2.3