From 46dabfabdc7b6cc12cbad9863e38ab1ff97c40a5 Mon Sep 17 00:00:00 2001
From: merabtenei <i.merabtene.gd@gmail.com>
Date: Mon, 29 May 2023 16:03:12 +0100
Subject: fix return null value

---
 src/main/java/org/traccar/model/ExtendedModel.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/traccar/model/ExtendedModel.java b/src/main/java/org/traccar/model/ExtendedModel.java
index d3d247fdd..0a0923ba1 100644
--- a/src/main/java/org/traccar/model/ExtendedModel.java
+++ b/src/main/java/org/traccar/model/ExtendedModel.java
@@ -90,8 +90,9 @@ public class ExtendedModel extends BaseModel {
     }
 
     public String getString(String key, String defaultValue) {
-        if (attributes.containsKey(key) && attributes.get(key) != null) {
-            return attributes.get(key).toString();
+        if (attributes.containsKey(key)) {
+            Object value = attributes.containsKey(key);
+            return value != null ? value.toString() : null;
         } else {
             return defaultValue;
         }
-- 
cgit v1.2.3