Refactor driver event handler

1 files changed, 1 insertions, 7 deletions

diff --git a/src/org/traccar/BasePipelineFactory.java b/src/org/traccar/BasePipelineFactory.java
index 57e7322aa..f8800ada2 100644
--- a/src/org/traccar/BasePipelineFactory.java
+++ b/src/org/traccar/BasePipelineFactory.java
@@ -59,8 +59,6 @@ public abstract class BasePipelineFactory extends ChannelInitializer<Channel> {
     private boolean eventsEnabled;
     private int timeout;
 
-    private DriverEventHandler driverEventHandler;
-
     public BasePipelineFactory(TrackerServer server, String protocol) {
         this.server = server;
         eventsEnabled = Context.getConfig().getBoolean(Keys.EVENT_ENABLE);
@@ -68,10 +66,6 @@ public abstract class BasePipelineFactory extends ChannelInitializer<Channel> {
         if (timeout == 0) {
             timeout = Context.getConfig().getInteger(Keys.SERVER_TIMEOUT);
         }
-
-        if (eventsEnabled) {
-            driverEventHandler = new DriverEventHandler();
-        }
     }
 
     protected abstract void addProtocolHandlers(PipelineBuilder pipeline);
@@ -152,7 +146,7 @@ public abstract class BasePipelineFactory extends ChannelInitializer<Channel> {
                     Main.getInjector().getInstance(AlertEventHandler.class),
                     Main.getInjector().getInstance(IgnitionEventHandler.class),
                     Main.getInjector().getInstance(MaintenanceEventHandler.class),
-                    driverEventHandler);
+                    Main.getInjector().getInstance(DriverEventHandler.class));
         }
 
         pipeline.addLast(new MainEventHandler());