diff options
| author | Vitaly Litvak <vitavaque@gmail.com> | 2015-09-06 11:39:39 +0300 |
|---|---|---|
| committer | Vitaly Litvak <vitavaque@gmail.com> | 2015-09-06 11:39:39 +0300 |
| commit | 466364542c61e103d0e9d38aca70e729e688be35 (patch) | |
| tree | 29166801123bba650c140bcf40842591d51466db | |
| parent | c7d05ca6969e7fd00f7000b47efe3865ff0d2cc2 (diff) | |
| download | trackermap-server-466364542c61e103d0e9d38aca70e729e688be35.tar.gz trackermap-server-466364542c61e103d0e9d38aca70e729e688be35.tar.bz2 trackermap-server-466364542c61e103d0e9d38aca70e729e688be35.zip | |
For #1395 - updated 'web.type' values to lower case
| -rw-r--r-- | src/org/traccar/Context.java | 2 | ||||
| -rw-r--r-- | src/org/traccar/database/DataManager.java | 2 | ||||
| -rw-r--r-- | src/org/traccar/web/WebServer.java | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/org/traccar/Context.java b/src/org/traccar/Context.java index 86174d30f..80c9efb40 100644 --- a/src/org/traccar/Context.java +++ b/src/org/traccar/Context.java @@ -125,7 +125,7 @@ public class Context { } if (config.getBoolean("web.enable")) { - if (config.getString("web.type", "NEW").equals("NEW") || config.getString("web.type", "NEW").equals("API")) { + if (config.getString("web.type", "new").equals("new") || config.getString("web.type", "new").equals("api")) { permissionsManager = new PermissionsManager(dataManager); } webServer = new WebServer(config, dataManager.getDataSource()); diff --git a/src/org/traccar/database/DataManager.java b/src/org/traccar/database/DataManager.java index 08c721e83..add355ea7 100644 --- a/src/org/traccar/database/DataManager.java +++ b/src/org/traccar/database/DataManager.java @@ -143,7 +143,7 @@ public class DataManager implements IdentityManager { private void initDatabaseSchema() throws SQLException { - if (config.getString("web.type", "NEW").equals("NEW") || config.getString("web.type", "NEW").equals("API")) { + if (config.getString("web.type", "new").equals("new") || config.getString("web.type", "new").equals("api")) { Connection connection = dataSource.getConnection(); ResultSet result = connection.getMetaData().getTables( diff --git a/src/org/traccar/web/WebServer.java b/src/org/traccar/web/WebServer.java index 415c81c73..29af2b16e 100644 --- a/src/org/traccar/web/WebServer.java +++ b/src/org/traccar/web/WebServer.java @@ -53,15 +53,15 @@ public class WebServer { this.dataSource = dataSource; initServer(); - switch (config.getString("web.type", "NEW")) { - case "API": + switch (config.getString("web.type", "new")) { + case "api": initApi(); break; - case "NEW": + case "new": initApi(); initWebApp(); break; - case "OLD": + case "old": initApi(); initOldWebApp(); break; |