Fix database init sequence

2 files changed, 5 insertions, 0 deletions

diff --git a/src/org/traccar/http/DeviceServlet.java b/src/org/traccar/http/DeviceServlet.java
index 1e8e1f047..2a3e15a80 100644
--- a/src/org/traccar/http/DeviceServlet.java
+++ b/src/org/traccar/http/DeviceServlet.java
@@ -47,6 +47,7 @@ public class DeviceServlet extends BaseServlet {
         Device device = JsonConverter.objectFromJson(req.getReader(), new Device());
         Context.getDataManager().addDevice(device);
         Context.getDataManager().linkDevice(getUserId(req), device.getId());
+        Context.getPermissionsManager().refresh();
         sendResponse(resp.getWriter(), JsonConverter.objectToJson(device));
     }
     
@@ -61,6 +62,7 @@ public class DeviceServlet extends BaseServlet {
         Device device = JsonConverter.objectFromJson(req.getReader(), new Device());
         Context.getPermissionsManager().checkDevice(getUserId(req), device.getId());
         Context.getDataManager().removeDevice(device);
+        Context.getPermissionsManager().refresh();
         sendResponse(resp.getWriter(), true);
     }
 
diff --git a/src/org/traccar/http/UserServlet.java b/src/org/traccar/http/UserServlet.java
index 19a70ac93..71af74485 100644
--- a/src/org/traccar/http/UserServlet.java
+++ b/src/org/traccar/http/UserServlet.java
@@ -48,6 +48,7 @@ public class UserServlet extends BaseServlet {
         User user = JsonConverter.objectFromJson(req.getReader(), new User());
         Context.getPermissionsManager().checkUser(getUserId(req), user.getId());
         Context.getDataManager().addUser(user);
+        Context.getPermissionsManager().refresh();
         sendResponse(resp.getWriter(), JsonConverter.objectToJson(user));
     }
     
@@ -59,6 +60,7 @@ public class UserServlet extends BaseServlet {
             Context.getPermissionsManager().checkUser(getUserId(req), user.getId());
         }
         Context.getDataManager().updateUser(user);
+        Context.getPermissionsManager().refresh();
         sendResponse(resp.getWriter(), true);
     }
     
@@ -66,6 +68,7 @@ public class UserServlet extends BaseServlet {
         User user = JsonConverter.objectFromJson(req.getReader(), new User());
         Context.getPermissionsManager().checkUser(getUserId(req), user.getId());
         Context.getDataManager().removeUser(user);
+        Context.getPermissionsManager().refresh();
         sendResponse(resp.getWriter(), true);
     }