Persist device status (fix #4890, fix #4891)

1 files changed, 0 insertions, 14 deletions

diff --git a/src/main/java/org/traccar/session/cache/CacheManager.java b/src/main/java/org/traccar/session/cache/CacheManager.java
index c1697faf9..4e99161dd 100644
--- a/src/main/java/org/traccar/session/cache/CacheManager.java
+++ b/src/main/java/org/traccar/session/cache/CacheManager.java
@@ -18,7 +18,6 @@ package org.traccar.session.cache;
 import org.traccar.broadcast.BroadcastInterface;
 import org.traccar.broadcast.BroadcastService;
 import org.traccar.config.Config;
-import org.traccar.helper.model.GeofenceUtil;
 import org.traccar.model.Attribute;
 import org.traccar.model.BaseModel;
 import org.traccar.model.Device;
@@ -224,10 +223,6 @@ public class CacheManager implements BroadcastInterface {
             } finally {
                 lock.writeLock().unlock();
             }
-
-            if (object instanceof Device) {
-                invalidateDeviceGeofences((Device) object);
-            }
         }
     }
 
@@ -304,8 +299,6 @@ public class CacheManager implements BroadcastInterface {
                 devicePositions.put(deviceId, storage.getObject(Position.class, new Request(
                         new Columns.All(), new Condition.Equals("id", "id", device.getPositionId()))));
             }
-
-            invalidateDeviceGeofences(device);
         }
     }
 
@@ -359,11 +352,4 @@ public class CacheManager implements BroadcastInterface {
         }
     }
 
-    private void invalidateDeviceGeofences(Device device) {
-        Position position = getPosition(device.getId());
-        if (position != null) {
-            device.setGeofenceIds(GeofenceUtil.getCurrentGeofences(config, this, position));
-        }
-    }
-
 }