diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2015-09-07 09:34:03 +1200 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2015-09-07 09:34:03 +1200 |
| commit | bffaeb73d428d6b8cf78a727d9f48b6ef3722431 (patch) | |
| tree | 29166801123bba650c140bcf40842591d51466db /src/org/traccar/Context.java | |
| parent | 5f4e33e16040412edf3dbe34866a467429a9b37c (diff) | |
| parent | 466364542c61e103d0e9d38aca70e729e688be35 (diff) | |
| download | trackermap-server-bffaeb73d428d6b8cf78a727d9f48b6ef3722431.tar.gz trackermap-server-bffaeb73d428d6b8cf78a727d9f48b6ef3722431.tar.bz2 trackermap-server-bffaeb73d428d6b8cf78a727d9f48b6ef3722431.zip | |
Merge pull request #1397 from vitalidze/master
Initialise API for old interface
Diffstat (limited to 'src/org/traccar/Context.java')
| -rw-r--r-- | src/org/traccar/Context.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/org/traccar/Context.java b/src/org/traccar/Context.java index f818368d0..80c9efb40 100644 --- a/src/org/traccar/Context.java +++ b/src/org/traccar/Context.java @@ -125,12 +125,10 @@ public class Context { } if (config.getBoolean("web.enable")) { - if (!config.getBoolean("web.old")) { + if (config.getString("web.type", "new").equals("new") || config.getString("web.type", "new").equals("api")) { permissionsManager = new PermissionsManager(dataManager); - webServer = new WebServer(config); - } else { - webServer = new WebServer(config, dataManager.getDataSource()); } + webServer = new WebServer(config, dataManager.getDataSource()); } serverManager = new ServerManager(); |