diff options
| author | Abyss777 <abyss@fox5.ru> | 2018-02-09 12:08:13 +0500 |
|---|---|---|
| committer | Abyss777 <abyss@fox5.ru> | 2018-02-09 12:08:13 +0500 |
| commit | 6d7bc2fe5dfc38dbe25c488501a8f6c653928e33 (patch) | |
| tree | 37b5e25b3c983740c2760e1524955056ab2457ca | |
| parent | 96e45b5a990182ddc4b878e48d93d301d014427a (diff) | |
| download | trackermap-server-6d7bc2fe5dfc38dbe25c488501a8f6c653928e33.tar.gz trackermap-server-6d7bc2fe5dfc38dbe25c488501a8f6c653928e33.tar.bz2 trackermap-server-6d7bc2fe5dfc38dbe25c488501a8f6c653928e33.zip | |
Remove unnecessary checks
| -rw-r--r-- | src/org/traccar/WebDataHandler.java | 6 | ||||
| -rw-r--r-- | src/org/traccar/notification/EventForwarder.java | 10 |
2 files changed, 6 insertions, 10 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); diff --git a/src/org/traccar/notification/EventForwarder.java b/src/org/traccar/notification/EventForwarder.java index d1bdd4aba..8be4c23b0 100644 --- a/src/org/traccar/notification/EventForwarder.java +++ b/src/org/traccar/notification/EventForwarder.java @@ -1,5 +1,5 @@ /* - * Copyright 2016 Anton Tananaev (anton@traccar.org) + * Copyright 2016 - 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. @@ -85,11 +85,9 @@ public abstract class EventForwarder { if (position != null) { data.put(KEY_POSITION, position); } - if (event.getDeviceId() != 0) { - Device device = Context.getIdentityManager().getById(event.getDeviceId()); - if (device != null) { - data.put(KEY_DEVICE, device); - } + Device device = Context.getIdentityManager().getById(event.getDeviceId()); + if (device != null) { + data.put(KEY_DEVICE, device); } if (event.getGeofenceId() != 0) { Geofence geofence = Context.getGeofenceManager().getById(event.getGeofenceId()); |