aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2015-09-07 23:05:26 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2015-09-07 23:05:26 +1200
commit3b98d3c8727b569cc9d785e0b1e5ff01d0c26f2d (patch)
tree5c3076793adf33877607d93644085e8225445181 /src/org/traccar
parentbffaeb73d428d6b8cf78a727d9f48b6ef3722431 (diff)
parent9073204bf7c4d9be7a6355d72def253b336a894b (diff)
downloadtrackermap-server-3b98d3c8727b569cc9d785e0b1e5ff01d0c26f2d.tar.gz
trackermap-server-3b98d3c8727b569cc9d785e0b1e5ff01d0c26f2d.tar.bz2
trackermap-server-3b98d3c8727b569cc9d785e0b1e5ff01d0c26f2d.zip
Merge pull request #1398 from vitalidze/master
Change initialisation order
Diffstat (limited to 'src/org/traccar')
-rw-r--r--src/org/traccar/Context.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/org/traccar/Context.java b/src/org/traccar/Context.java
index 80c9efb40..7b364d799 100644
--- a/src/org/traccar/Context.java
+++ b/src/org/traccar/Context.java
@@ -106,8 +106,6 @@ public class Context {
}
identityManager = dataManager;
- connectionManager = new ConnectionManager(dataManager);
-
if (config.getBoolean("geocoder.enable")) {
String type = config.getString("geocoder.type", "google");
String url = config.getString("geocoder.url");
@@ -131,6 +129,8 @@ public class Context {
webServer = new WebServer(config, dataManager.getDataSource());
}
+ connectionManager = new ConnectionManager(dataManager);
+
serverManager = new ServerManager();
}