aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVitaly Litvak <vitavaque@gmail.com>2016-01-04 10:20:22 +0300
committerVitaly Litvak <vitavaque@gmail.com>2016-01-04 10:20:22 +0300
commit2343c85411614b0e16bb8a24eaafd8f33e1cfa71 (patch)
treee76e9e5249a8128087e2eaca778ee69fbb8cc880
parent03e0bd66a3a322e09b6f4cdbec7ec0fb266e0113 (diff)
downloadtrackermap-server-2343c85411614b0e16bb8a24eaafd8f33e1cfa71.tar.gz
trackermap-server-2343c85411614b0e16bb8a24eaafd8f33e1cfa71.tar.bz2
trackermap-server-2343c85411614b0e16bb8a24eaafd8f33e1cfa71.zip
For #1606 - always start PermissionsManager when WebServer is going to be started (do not check the type of web application)
-rw-r--r--src/org/traccar/Context.java5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/org/traccar/Context.java b/src/org/traccar/Context.java
index c833d0c2e..55561b921 100644
--- a/src/org/traccar/Context.java
+++ b/src/org/traccar/Context.java
@@ -168,10 +168,7 @@ public final class Context {
}
if (config.getBoolean("web.enable")) {
- if (config.getString("web.type", "new").equals("new")
- || config.getString("web.type", "new").equals("api")) {
- permissionsManager = new PermissionsManager(dataManager);
- }
+ permissionsManager = new PermissionsManager(dataManager);
webServer = new WebServer(config, dataManager.getDataSource());
}