From 2fcffc5b55f59310d289a21d1ebc2ee6bf15bcd5 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton@traccar.org>
Date: Sat, 25 Jun 2022 14:17:00 -0700
Subject: Fix connection users issue

---
 src/main/java/org/traccar/api/AsyncSocket.java             | 7 +++----
 src/main/java/org/traccar/api/resource/DeviceResource.java | 4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'src/main/java/org/traccar/api')

diff --git a/src/main/java/org/traccar/api/AsyncSocket.java b/src/main/java/org/traccar/api/AsyncSocket.java
index 40aa68e88..5fc4b4412 100644
--- a/src/main/java/org/traccar/api/AsyncSocket.java
+++ b/src/main/java/org/traccar/api/AsyncSocket.java
@@ -58,15 +58,14 @@ public class AsyncSocket extends WebSocketAdapter implements ConnectionManager.U
     public void onWebSocketConnect(Session session) {
         super.onWebSocketConnect(session);
 
-        Map<String, Collection<?>> data = new HashMap<>();
         try {
+            Map<String, Collection<?>> data = new HashMap<>();
             data.put(KEY_POSITIONS, PositionUtil.getLatestPositions(storage, userId));
+            sendData(data);
+            connectionManager.addListener(userId, this);
         } catch (StorageException e) {
             throw new RuntimeException(e);
         }
-        sendData(data);
-
-        connectionManager.addListener(userId, this);
     }
 
     @Override
diff --git a/src/main/java/org/traccar/api/resource/DeviceResource.java b/src/main/java/org/traccar/api/resource/DeviceResource.java
index 2b673a108..e205f2d28 100644
--- a/src/main/java/org/traccar/api/resource/DeviceResource.java
+++ b/src/main/java/org/traccar/api/resource/DeviceResource.java
@@ -137,8 +137,8 @@ public class DeviceResource extends BaseObjectResource<Device> {
             try {
                 cacheManager.addDevice(position.getDeviceId());
                 cacheManager.updatePosition(position);
-                connectionManager.updatePosition(position);
-                broadcastService.updatePosition(position);
+                connectionManager.updatePosition(true, position);
+                broadcastService.updatePosition(true, position);
             } finally {
                 cacheManager.removeDevice(position.getDeviceId());
             }
-- 
cgit v1.2.3