From 6cc15fb06c9490e349847e043eea7c188e88794e Mon Sep 17 00:00:00 2001
From: merabtenei <i.merabtene.gd@gmail.com>
Date: Sun, 28 May 2023 21:38:14 +0100
Subject: fix NullPointerException when attribute key is defined and value is
 set to null, caused by calling .toString() on null.

---
 src/main/java/org/traccar/model/ExtendedModel.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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