aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton@traccar.org>2022-09-08 06:15:12 -0700
committerAnton Tananaev <anton@traccar.org>2022-09-08 06:15:12 -0700
commit596f755e19ec38cf5ce426595e2fba1a5b156338 (patch)
tree65c014962ed0f31215620dd60a7d14a50ce49e11
parent3ae99730940f0f108a0c655f0cb52c109ca57885 (diff)
downloadtrackermap-server-596f755e19ec38cf5ce426595e2fba1a5b156338.tar.gz
trackermap-server-596f755e19ec38cf5ce426595e2fba1a5b156338.tar.bz2
trackermap-server-596f755e19ec38cf5ce426595e2fba1a5b156338.zip
Attributes never null
-rw-r--r--src/main/java/org/traccar/model/ExtendedModel.java5
1 files 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 0fa1856d1..ef2e3b68f 100644
--- a/src/main/java/org/traccar/model/ExtendedModel.java
+++ b/src/main/java/org/traccar/model/ExtendedModel.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016 - 2017 Anton Tananaev (anton@traccar.org)
+ * Copyright 2016 - 2022 Anton Tananaev (anton@traccar.org)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@ package org.traccar.model;
import java.util.LinkedHashMap;
import java.util.Map;
+import java.util.Objects;
public class ExtendedModel extends BaseModel {
@@ -31,7 +32,7 @@ public class ExtendedModel extends BaseModel {
}
public void setAttributes(Map<String, Object> attributes) {
- this.attributes = attributes;
+ this.attributes = Objects.requireNonNullElseGet(attributes, LinkedHashMap::new);
}
public void set(String key, Boolean value) {