aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/model/MiscFormatter.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/org/traccar/model/MiscFormatter.java')
-rw-r--r--src/org/traccar/model/MiscFormatter.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/org/traccar/model/MiscFormatter.java b/src/org/traccar/model/MiscFormatter.java
index d1e1ae959..7a1e69082 100644
--- a/src/org/traccar/model/MiscFormatter.java
+++ b/src/org/traccar/model/MiscFormatter.java
@@ -15,6 +15,8 @@
*/
package org.traccar.model;
+import org.traccar.web.JsonConverter;
+
import java.text.DecimalFormat;
import java.util.LinkedHashMap;
import java.util.Map;
@@ -73,6 +75,10 @@ public class MiscFormatter {
json.add(entry.getKey(), (Double) entry.getValue());
} else if (entry.getValue() instanceof Boolean) {
json.add(entry.getKey(), (Boolean) entry.getValue());
+ } else if (entry.getValue() == null) {
+ json.add(entry.getKey(), JsonValue.NULL);
+ } else {
+ json.add(entry.getKey(), JsonConverter.objectToJson(entry.getValue()));
}
}