diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2018-02-10 08:24:14 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-10 08:24:14 +1300 |
| commit | e1bd30161e842b61e395e932ec9251a326025ad8 (patch) | |
| tree | fc142d1f296623186e55ef0cd51df4219fa8dbc1 /src/org/traccar/WebDataHandler.java | |
| parent | 96e45b5a990182ddc4b878e48d93d301d014427a (diff) | |
| parent | 267c6e1651b6e0e91dd7c3463f86de929d7bc73c (diff) | |
| download | trackermap-server-e1bd30161e842b61e395e932ec9251a326025ad8.tar.gz trackermap-server-e1bd30161e842b61e395e932ec9251a326025ad8.tar.bz2 trackermap-server-e1bd30161e842b61e395e932ec9251a326025ad8.zip | |
Merge pull request #3765 from Abyss777/device_timezone
Unified Device timezone handling
Diffstat (limited to 'src/org/traccar/WebDataHandler.java')
| -rw-r--r-- | src/org/traccar/WebDataHandler.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/org/traccar/WebDataHandler.java b/src/org/traccar/WebDataHandler.java index adc82486c..cdd9d0c11 100644 --- a/src/org/traccar/WebDataHandler.java +++ b/src/org/traccar/WebDataHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2016 Anton Tananaev (anton@traccar.org) + * Copyright 2015 - 2018 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. @@ -148,9 +148,7 @@ public class WebDataHandler extends BaseDataHandler { Map<String, Object> data = new HashMap<>(); Device device = Context.getIdentityManager().getById(position.getDeviceId()); - if (position != null) { - data.put(KEY_POSITION, position); - } + data.put(KEY_POSITION, position); if (device != null) { data.put(KEY_DEVICE, device); |