aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/api
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2016-07-11 23:23:21 +1200
committerGitHub <noreply@github.com>2016-07-11 23:23:21 +1200
commita4a127b5255cd62aae25419dbf289a926c5adbfd (patch)
tree05b99cf458f597806cde9617fe28c5bccd557c22 /src/org/traccar/api
parent817360eee7dba57cf8b58e858f7acf60f27b5e68 (diff)
parent0bda01815c51b1f1e1d3e3eda592219eb39bf78b (diff)
downloadtrackermap-server-a4a127b5255cd62aae25419dbf289a926c5adbfd.tar.gz
trackermap-server-a4a127b5255cd62aae25419dbf289a926c5adbfd.tar.bz2
trackermap-server-a4a127b5255cd62aae25419dbf289a926c5adbfd.zip
Merge pull request #2099 from Abyss777/fix_groups_cache
Revert back groups cache and split refresh
Diffstat (limited to 'src/org/traccar/api')
-rw-r--r--src/org/traccar/api/resource/GeofencePermissionResource.java4
-rw-r--r--src/org/traccar/api/resource/GeofenceResource.java4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/org/traccar/api/resource/GeofencePermissionResource.java b/src/org/traccar/api/resource/GeofencePermissionResource.java
index 329c72b07..3a82845f5 100644
--- a/src/org/traccar/api/resource/GeofencePermissionResource.java
+++ b/src/org/traccar/api/resource/GeofencePermissionResource.java
@@ -39,7 +39,7 @@ public class GeofencePermissionResource extends BaseResource {
Context.getPermissionsManager().checkUser(getUserId(), entity.getUserId());
Context.getPermissionsManager().checkGeofence(getUserId(), entity.getGeofenceId());
Context.getDataManager().linkGeofence(entity.getUserId(), entity.getGeofenceId());
- Context.getGeofenceManager().refresh();
+ Context.getGeofenceManager().refreshUserGeofences();
return Response.ok(entity).build();
}
@@ -49,7 +49,7 @@ public class GeofencePermissionResource extends BaseResource {
Context.getPermissionsManager().checkUser(getUserId(), entity.getUserId());
Context.getPermissionsManager().checkGeofence(getUserId(), entity.getGeofenceId());
Context.getDataManager().unlinkGeofence(entity.getUserId(), entity.getGeofenceId());
- Context.getGeofenceManager().refresh();
+ Context.getGeofenceManager().refreshUserGeofences();
return Response.noContent().build();
}
diff --git a/src/org/traccar/api/resource/GeofenceResource.java b/src/org/traccar/api/resource/GeofenceResource.java
index 44f6fc2f5..960ab813f 100644
--- a/src/org/traccar/api/resource/GeofenceResource.java
+++ b/src/org/traccar/api/resource/GeofenceResource.java
@@ -78,7 +78,7 @@ public class GeofenceResource extends BaseResource {
Context.getPermissionsManager().checkReadonly(getUserId());
Context.getDataManager().addGeofence(entity);
Context.getDataManager().linkGeofence(getUserId(), entity.getId());
- Context.getGeofenceManager().refresh();
+ Context.getGeofenceManager().refreshGeofences();
return Response.ok(entity).build();
}
@@ -97,7 +97,7 @@ public class GeofenceResource extends BaseResource {
Context.getPermissionsManager().checkReadonly(getUserId());
Context.getPermissionsManager().checkGeofence(getUserId(), id);
Context.getDataManager().removeGeofence(id);
- Context.getGeofenceManager().refresh();
+ Context.getGeofenceManager().refreshGeofences();
return Response.noContent().build();
}