Fix offline device notifications

1 files changed, 5 insertions, 2 deletions

diff --git a/src/main/java/org/traccar/session/ConnectionManager.java b/src/main/java/org/traccar/session/ConnectionManager.java
index 05c4893fd..fe6521d18 100644
--- a/src/main/java/org/traccar/session/ConnectionManager.java
+++ b/src/main/java/org/traccar/session/ConnectionManager.java
@@ -144,7 +144,10 @@ public class ConnectionManager {
             endpointSessions.put(device.getUniqueId(), deviceSession);
             sessionsByEndpoint.put(endpoint, endpointSessions);
             sessionsByDeviceId.put(device.getId(), deviceSession);
-            cacheManager.addDevice(device.getId());
+
+            if (oldSession == null) {
+                cacheManager.addDevice(device.getId());
+            }
 
             return deviceSession;
         } else {
@@ -190,8 +193,8 @@ public class ConnectionManager {
     public void deviceUnknown(long deviceId) {
         updateDevice(deviceId, Device.STATUS_UNKNOWN, null);
         DeviceSession deviceSession = sessionsByDeviceId.remove(deviceId);
-        cacheManager.removeDevice(deviceId);
         if (deviceSession != null) {
+            cacheManager.removeDevice(deviceId);
             Endpoint endpoint = new Endpoint(deviceSession.getChannel(), deviceSession.getRemoteAddress());
             sessionsByEndpoint.computeIfPresent(endpoint, (e, sessions) -> {
                 sessions.remove(deviceSession.getUniqueId());