Merge pull request #1398 from vitalidze/master

Change initialisation order

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();
     }