From 34a5823cb19d4b957da1c0bdda426eb8e76950d2 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Mon, 25 Feb 2019 23:50:42 -0800
Subject: Refactor copy attributes handler

---
 src/org/traccar/BasePipelineFactory.java | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'src/org/traccar/BasePipelineFactory.java')

diff --git a/src/org/traccar/BasePipelineFactory.java b/src/org/traccar/BasePipelineFactory.java
index 1b3be36fc..088689fe7 100644
--- a/src/org/traccar/BasePipelineFactory.java
+++ b/src/org/traccar/BasePipelineFactory.java
@@ -57,7 +57,6 @@ public abstract class BasePipelineFactory extends ChannelInitializer<Channel> {
     private final TrackerServer server;
     private int timeout;
 
-    private CopyAttributesHandler copyAttributesHandler;
     private ComputedAttributesHandler computedAttributesHandler;
 
     private CommandResultEventHandler commandResultEventHandler;
@@ -78,10 +77,6 @@ public abstract class BasePipelineFactory extends ChannelInitializer<Channel> {
             timeout = Context.getConfig().getInteger(Keys.SERVER_TIMEOUT);
         }
 
-        if (Context.getConfig().getBoolean("processing.copyAttributes.enable")) {
-            copyAttributesHandler = new CopyAttributesHandler();
-        }
-
         if (Context.getConfig().getBoolean("processing.computedAttributes.enable")) {
             computedAttributesHandler = new ComputedAttributesHandler();
         }
@@ -161,7 +156,7 @@ public abstract class BasePipelineFactory extends ChannelInitializer<Channel> {
                 Main.getInjector().getInstance(GeocoderHandler.class),
                 Main.getInjector().getInstance(MotionHandler.class),
                 Main.getInjector().getInstance(EngineHoursHandler.class),
-                copyAttributesHandler,
+                Main.getInjector().getInstance(CopyAttributesHandler.class),
                 computedAttributesHandler);
 
         if (Context.getDataManager() != null) {
-- 
cgit v1.2.3