diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2016-07-20 23:03:09 +1200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-20 23:03:09 +1200 |
| commit | 73a7bbeb1f2c6caf7b1677e3616552ddb3eddeec (patch) | |
| tree | 44b6ec5bcdf21990a3aff61a2cd556db0e8f463b /src/org/traccar/database/GeofenceManager.java | |
| parent | 8e4d44e045c6e0c800b3b353f6f55c64d731428c (diff) | |
| parent | 56784bd167ddf0bbc124269519b7a93b346bd5cc (diff) | |
| download | trackermap-server-73a7bbeb1f2c6caf7b1677e3616552ddb3eddeec.tar.gz trackermap-server-73a7bbeb1f2c6caf7b1677e3616552ddb3eddeec.tar.bz2 trackermap-server-73a7bbeb1f2c6caf7b1677e3616552ddb3eddeec.zip | |
Merge pull request #2132 from Abyss777/move_groups_to_device_manager
Move groups related actions to DeviceManager
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 930008082..74dff70f4 100644 --- a/src/org/traccar/database/GeofenceManager.java +++ b/src/org/traccar/database/GeofenceManager.java @@ -188,8 +188,8 @@ public class GeofenceManager { while (groupId != 0) { getDeviceGeofences(deviceGeofencesWithGroups, device.getId()).addAll(getGroupGeofences(groupId)); - if (dataManager.getGroupById(groupId) != null) { - groupId = dataManager.getGroupById(groupId).getGroupId(); + if (Context.getDeviceManager().getGroupById(groupId) != null) { + groupId = Context.getDeviceManager().getGroupById(groupId).getGroupId(); } else { groupId = 0; } |