Merge remote-tracking branch 'refs/remotes/tananaev/master'

2 files changed, 12 insertions, 5 deletions

diff --git a/src/org/traccar/database/DataManager.java b/src/org/traccar/database/DataManager.java
index a9fc09448..239fc1930 100644
--- a/src/org/traccar/database/DataManager.java
+++ b/src/org/traccar/database/DataManager.java
@@ -401,9 +401,11 @@ public class DataManager implements IdentityManager {
         QueryBuilder.create(dataSource, getQuery("database.updateDeviceStatus"))
                 .setObject(device)
                 .executeUpdate();
-        Device cachedDevice = getDeviceById(device.getId());
-        cachedDevice.setStatus(device.getStatus());
-        cachedDevice.setMotion(device.getMotion());
+        if (devicesById.containsKey(device.getId())) {
+            Device cachedDevice = devicesById.get(device.getId());
+            cachedDevice.setStatus(device.getStatus());
+            cachedDevice.setMotion(device.getMotion());
+        }
     }
 
     public void removeDevice(long deviceId) throws SQLException {
@@ -512,8 +514,10 @@ public class DataManager implements IdentityManager {
                 .setDate("now", new Date())
                 .setObject(position)
                 .executeUpdate();
-        Device device = getDeviceById(position.getDeviceId());
-        device.setPositionId(position.getId());
+        if (devicesById.containsKey(position.getDeviceId())) {
+            Device cachedDevice = devicesById.get(position.getDeviceId());
+            cachedDevice.setPositionId(position.getId());
+        }
     }
 
     public Collection<Position> getLatestPositions() throws SQLException {
diff --git a/src/org/traccar/database/NotificationManager.java b/src/org/traccar/database/NotificationManager.java
index e618d7ed3..911c5d2dc 100644
--- a/src/org/traccar/database/NotificationManager.java
+++ b/src/org/traccar/database/NotificationManager.java
@@ -68,6 +68,9 @@ public class NotificationManager {
                 }
             }
         }
+        if (Context.getEventForvarder() != null) {
+            Context.getEventForvarder().forwardEvent(event, position);
+        }
     }
 
     public void updateEvents(Collection<Event> events, Position position) {