diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2022-09-18 10:09:02 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-18 10:09:02 -0700 |
| commit | d702c9caf113ca761c57f811b128f8188c9dec0c (patch) | |
| tree | 8891e32d889f68ccbb294585bc0ff89875583567 /src/main/java/org/traccar/model | |
| parent | d4513fa86539577e24ede46d40748d8d034b025c (diff) | |
| parent | 4de8efe1ef0810af492c161bfc1d3200958d75d8 (diff) | |
| download | trackermap-server-d702c9caf113ca761c57f811b128f8188c9dec0c.tar.gz trackermap-server-d702c9caf113ca761c57f811b128f8188c9dec0c.tar.bz2 trackermap-server-d702c9caf113ca761c57f811b128f8188c9dec0c.zip | |
Merge branch 'master' into ndtpv6-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) { |