From 6adcd4a8dd950a5f945c818280974a0302c9fd8b Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Sun, 15 Mar 2020 15:46:27 -0700
Subject: Remove duplication

---
 src/main/java/org/traccar/BaseProtocolDecoder.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/main/java/org/traccar/BaseProtocolDecoder.java')

diff --git a/src/main/java/org/traccar/BaseProtocolDecoder.java b/src/main/java/org/traccar/BaseProtocolDecoder.java
index 634ceafd5..d014b0871 100644
--- a/src/main/java/org/traccar/BaseProtocolDecoder.java
+++ b/src/main/java/org/traccar/BaseProtocolDecoder.java
@@ -233,16 +233,18 @@ public abstract class BaseProtocolDecoder extends ExtendedObjectDecoder {
                 }
             }
         }
+        long deviceId = 0;
         if (position != null) {
-            connectionManager.updateDevice(
-                    position.getDeviceId(), Device.STATUS_ONLINE, new Date());
+            deviceId = position.getDeviceId();
         } else {
             DeviceSession deviceSession = getDeviceSession(channel, remoteAddress);
             if (deviceSession != null) {
-                connectionManager.updateDevice(
-                        deviceSession.getDeviceId(), Device.STATUS_ONLINE, new Date());
+                deviceId = deviceSession.getDeviceId();
             }
         }
+        if (deviceId > 0) {
+            connectionManager.updateDevice(deviceId, Device.STATUS_ONLINE, new Date());
+        }
     }
 
     @Override
-- 
cgit v1.2.3