Merge pull request #3947 from Abyss777/fix_queued

Send queued commands on status online

1 files changed, 5 insertions, 3 deletions

diff --git a/src/org/traccar/database/ConnectionManager.java b/src/org/traccar/database/ConnectionManager.java
index ac60287ae..ef2085295 100644
--- a/src/org/traccar/database/ConnectionManager.java
+++ b/src/org/traccar/database/ConnectionManager.java
@@ -57,9 +57,7 @@ public class ConnectionManager {
     }
 
     public void addActiveDevice(long deviceId, Protocol protocol, Channel channel, SocketAddress remoteAddress) {
-        ActiveDevice activeDevice = new ActiveDevice(deviceId, protocol, channel, remoteAddress);
-        activeDevices.put(deviceId, activeDevice);
-        Context.getCommandsManager().sendQueuedCommands(activeDevice);
+        activeDevices.put(deviceId, new ActiveDevice(deviceId, protocol, channel, remoteAddress));
     }
 
     public void removeActiveDevice(Channel channel) {
@@ -136,6 +134,10 @@ public class ConnectionManager {
         }
 
         updateDevice(device);
+
+        if (status.equals(Device.STATUS_ONLINE) && !oldStatus.equals(Device.STATUS_ONLINE)) {
+            Context.getCommandsManager().sendQueuedCommands(getActiveDevice(deviceId));
+        }
     }
 
     public Map<Event, Position> updateDeviceState(long deviceId) {