diff options
| author | ninioe <ninioe@gmail.com> | 2016-07-19 09:07:23 +0300 |
|---|---|---|
| committer | ninioe <ninioe@gmail.com> | 2016-07-19 09:07:23 +0300 |
| commit | ef40f3317392068692606b484c6782b95b554cbf (patch) | |
| tree | 41c48e6c87620a6444aed0ad5706a94e26b1662d /src/org/traccar/database/GeofenceManager.java | |
| parent | 04627d7473e4ea21d6ecd950cbb3fdd6fa249429 (diff) | |
| parent | d3e063cf9de8a45bed4dfe87b73aadfd8d2edeab (diff) | |
| download | traccar-server-ef40f3317392068692606b484c6782b95b554cbf.tar.gz traccar-server-ef40f3317392068692606b484c6782b95b554cbf.tar.bz2 traccar-server-ef40f3317392068692606b484c6782b95b554cbf.zip | |
Merge remote-tracking branch 'refs/remotes/tananaev/master'
Diffstat (limited to 'src/org/traccar/database/GeofenceManager.java')
| -rw-r--r-- | src/org/traccar/database/GeofenceManager.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/org/traccar/database/GeofenceManager.java b/src/org/traccar/database/GeofenceManager.java index c35e19e9a..dc31172b9 100644 --- a/src/org/traccar/database/GeofenceManager.java +++ b/src/org/traccar/database/GeofenceManager.java @@ -173,7 +173,7 @@ public class GeofenceManager { .add(deviceGeofence.getGeofenceId()); } - for (Device device : dataManager.getAllDevicesCached()) { + for (Device device : Context.getDeviceManager().getAllDevices()) { long groupId = device.getGroupId(); while (groupId != 0) { getDeviceGeofences(deviceGeofencesWithGroups, @@ -190,7 +190,7 @@ public class GeofenceManager { } else { deviceGeofenceIds.clear(); } - Position lastPosition = Context.getConnectionManager().getLastPosition(device.getId()); + Position lastPosition = Context.getIdentityManager().getLastPosition(device.getId()); if (lastPosition != null && deviceGeofencesWithGroups.containsKey(device.getId())) { for (long geofenceId : deviceGeofencesWithGroups.get(device.getId())) { Geofence geofence = getGeofence(geofenceId); |