Reduce dependencies on data manager (fix #954)

1 files changed, 9 insertions, 8 deletions

diff --git a/src/org/traccar/database/ConnectionManager.java b/src/org/traccar/database/ConnectionManager.java
index 0d357a41c..dc125d7b0 100644
--- a/src/org/traccar/database/ConnectionManager.java
+++ b/src/org/traccar/database/ConnectionManager.java
@@ -31,18 +31,19 @@ import org.traccar.model.Position;
 
 public class ConnectionManager {
 
-    private Map<String, ActiveDevice> activeDevices = new HashMap<>();
+    private final Map<String, ActiveDevice> activeDevices = new HashMap<>();
     private final Map<Long, Position> positions = new HashMap<>();
     private final Map<Long, Set<DataCacheListener>> listeners = new HashMap<>();
     
-    public void init(DataManager dataManager) {
-        try {
-            Collection<Position> positions = dataManager.getLatestPositions();
-            for (Position position : positions) {
-                this.positions.put(position.getDeviceId(), position);
+    public ConnectionManager(DataManager dataManager) {
+        if (dataManager != null) {
+            try {
+                for (Position position : dataManager.getLatestPositions()) {
+                    this.positions.put(position.getDeviceId(), position);
+                }
+            } catch (SQLException error) {
+                Log.warning(error);
             }
-        } catch (SQLException error) {
-            Log.warning(error);
         }
     }