diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2016-06-28 14:09:44 +1200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-28 14:09:44 +1200 |
| commit | 7327681f0bd2338f9c8ee3ea1b4a19dcc5f0de48 (patch) | |
| tree | 0ea99ab937fbae96b35cc5dc62edbc74594af9e4 /src/org/traccar/api/resource/DevicePermissionResource.java | |
| parent | 67f46c80d3b5e34440a2644f52b81dddfbaba5fa (diff) | |
| parent | 61b2486353c742afe6214f0a0c5c2e9956ea3b97 (diff) | |
| download | trackermap-server-7327681f0bd2338f9c8ee3ea1b4a19dcc5f0de48.tar.gz trackermap-server-7327681f0bd2338f9c8ee3ea1b4a19dcc5f0de48.tar.bz2 trackermap-server-7327681f0bd2338f9c8ee3ea1b4a19dcc5f0de48.zip | |
Merge pull request #2052 from Abyss777/master
Notifications via email
Diffstat (limited to 'src/org/traccar/api/resource/DevicePermissionResource.java')
| -rw-r--r-- | src/org/traccar/api/resource/DevicePermissionResource.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/org/traccar/api/resource/DevicePermissionResource.java b/src/org/traccar/api/resource/DevicePermissionResource.java index 2ef436f11..7de050074 100644 --- a/src/org/traccar/api/resource/DevicePermissionResource.java +++ b/src/org/traccar/api/resource/DevicePermissionResource.java @@ -38,7 +38,9 @@ public class DevicePermissionResource extends BaseResource { Context.getPermissionsManager().checkAdmin(getUserId()); Context.getDataManager().linkDevice(entity.getUserId(), entity.getDeviceId()); Context.getPermissionsManager().refresh(); - Context.getGeofenceManager().refresh(); + if (Context.getGeofenceManager() != null) { + Context.getGeofenceManager().refresh(); + } return Response.ok(entity).build(); } @@ -47,7 +49,9 @@ public class DevicePermissionResource extends BaseResource { Context.getPermissionsManager().checkAdmin(getUserId()); Context.getDataManager().unlinkDevice(entity.getUserId(), entity.getDeviceId()); Context.getPermissionsManager().refresh(); - Context.getGeofenceManager().refresh(); + if (Context.getGeofenceManager() != null) { + Context.getGeofenceManager().refresh(); + } return Response.noContent().build(); } |