diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2022-09-18 10:49:28 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-18 10:49:28 -0700 |
| commit | b118bd4cc8a64e768370ef19061e0f968136cf18 (patch) | |
| tree | 0f88d08b2e51d5285dde5ed7acdace5293be8373 /src/main/java/org/traccar/model | |
| parent | d55ae464806430ee57bbd56737f024ead95748a2 (diff) | |
| parent | 8532bffcec8e239c6699845e09e63da927f51d9a (diff) | |
| download | trackermap-server-b118bd4cc8a64e768370ef19061e0f968136cf18.tar.gz trackermap-server-b118bd4cc8a64e768370ef19061e0f968136cf18.tar.bz2 trackermap-server-b118bd4cc8a64e768370ef19061e0f968136cf18.zip | |
Merge branch 'master' into g1rus-dev
Diffstat (limited to 'src/main/java/org/traccar/model')
| -rw-r--r-- | src/main/java/org/traccar/model/ExtendedModel.java | 5 |
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) { |