1 files changed, 8 insertions, 4 deletions
diff --git a/src/org/traccar/database/ConnectionManager.java b/src/org/traccar/database/ConnectionManager.java
index 3d37af710..8bae1ea93 100644
--- a/src/org/traccar/database/ConnectionManager.java
+++ b/src/org/traccar/database/ConnectionManager.java
@@ -22,8 +22,10 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.traccar.Context;
 import org.traccar.GlobalTimer;
+import org.traccar.Main;
 import org.traccar.Protocol;
-import org.traccar.events.OverspeedEventHandler;
+import org.traccar.handler.events.MotionEventHandler;
+import org.traccar.handler.events.OverspeedEventHandler;
 import org.traccar.model.Device;
 import org.traccar.model.DeviceState;
 import org.traccar.model.Event;
@@ -147,13 +149,15 @@ public class ConnectionManager {
         DeviceState deviceState = Context.getDeviceManager().getDeviceState(deviceId);
         Map<Event, Position> result = new HashMap<>();
 
-        Map<Event, Position> event = Context.getMotionEventHandler().updateMotionState(deviceState);
+        Map<Event, Position> event = Main.getInjector()
+                .getInstance(MotionEventHandler.class).updateMotionState(deviceState);
         if (event != null) {
             result.putAll(event);
         }
 
-        event = Context.getOverspeedEventHandler().updateOverspeedState(deviceState, Context.getDeviceManager().
-                lookupAttributeDouble(deviceId, OverspeedEventHandler.ATTRIBUTE_SPEED_LIMIT, 0, false));
+        event = Main.getInjector().getInstance(OverspeedEventHandler.class)
+                .updateOverspeedState(deviceState, Context.getDeviceManager().
+                        lookupAttributeDouble(deviceId, OverspeedEventHandler.ATTRIBUTE_SPEED_LIMIT, 0, false));
         if (event != null) {
             result.putAll(event);
         }