Merge remote-tracking branch 'refs/remotes/tananaev/master'

1 files changed, 2 insertions, 3 deletions

diff --git a/src/org/traccar/api/resource/ServerResource.java b/src/org/traccar/api/resource/ServerResource.java
index 9e42687ab..0ca0d62aa 100644
--- a/src/org/traccar/api/resource/ServerResource.java
+++ b/src/org/traccar/api/resource/ServerResource.java
@@ -37,14 +37,13 @@ public class ServerResource extends BaseResource {
     @PermitAll
     @GET
     public Server get() throws SQLException {
-        return Context.getDataManager().getServer();
+        return Context.getPermissionsManager().getServer();
     }
 
     @PUT
     public Response update(Server entity) throws SQLException {
         Context.getPermissionsManager().checkAdmin(getUserId());
-        Context.getDataManager().updateServer(entity);
-        Context.getPermissionsManager().refresh();
+        Context.getPermissionsManager().updateServer(entity);
         return Response.ok(entity).build();
     }