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

1 files changed, 10 insertions, 1 deletions

diff --git a/src/org/traccar/database/PermissionsManager.java b/src/org/traccar/database/PermissionsManager.java
index d786dcc4e..92fcc3ebd 100644
--- a/src/org/traccar/database/PermissionsManager.java
+++ b/src/org/traccar/database/PermissionsManager.java
@@ -34,7 +34,7 @@ public class PermissionsManager {
 
     private final DataManager dataManager;
 
-    private Server server;
+    private volatile Server server;
 
     private final Map<Long, User> users = new HashMap<>();
 
@@ -153,4 +153,13 @@ public class PermissionsManager {
         }
     }
 
+    public Server getServer() {
+        return server;
+    }
+
+    public void updateServer(Server server) throws SQLException {
+        dataManager.updateServer(server);
+        this.server = server;
+    }
+
 }