aboutsummaryrefslogtreecommitdiff
path: root/src/org
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2015-11-20 10:11:11 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2015-11-20 10:11:11 +1300
commitffd0d7f5a60b33ba45c22210d4ba5f07f2a6d789 (patch)
tree268436e22bcc507d2a240c5c73cdfac353d3c424 /src/org
parent4c9466f694e48b69a14e9039bd9b8d717c3a3dc3 (diff)
downloadtrackermap-server-ffd0d7f5a60b33ba45c22210d4ba5f07f2a6d789.tar.gz
trackermap-server-ffd0d7f5a60b33ba45c22210d4ba5f07f2a6d789.tar.bz2
trackermap-server-ffd0d7f5a60b33ba45c22210d4ba5f07f2a6d789.zip
Check if device exists before update
Diffstat (limited to 'src/org')
-rw-r--r--src/org/traccar/database/ConnectionManager.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/org/traccar/database/ConnectionManager.java b/src/org/traccar/database/ConnectionManager.java
index ae931151d..e03fd1663 100644
--- a/src/org/traccar/database/ConnectionManager.java
+++ b/src/org/traccar/database/ConnectionManager.java
@@ -81,6 +81,10 @@ public class ConnectionManager {
public synchronized void updateDevice(final long deviceId, String status, Date time) {
Device device = Context.getIdentityManager().getDeviceById(deviceId);
+ if (device == null) {
+ return;
+ }
+
device.setStatus(status);
if (time != null) {
device.setLastUpdate(time);