From 5b269c0e309b70866ad167fb148eafcbad5a8b26 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton@traccar.org>
Date: Sat, 11 Jun 2022 07:27:19 -0700
Subject: Inject event forwarder

---
 src/main/java/org/traccar/Context.java | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

(limited to 'src/main/java/org/traccar/Context.java')

diff --git a/src/main/java/org/traccar/Context.java b/src/main/java/org/traccar/Context.java
index 471416926..95ff2eddb 100644
--- a/src/main/java/org/traccar/Context.java
+++ b/src/main/java/org/traccar/Context.java
@@ -127,12 +127,6 @@ public final class Context {
         return client;
     }
 
-    private static EventForwarder eventForwarder;
-
-    public static EventForwarder getEventForwarder() {
-        return eventForwarder;
-    }
-
     private static class ObjectMapperContextResolver implements ContextResolver<ObjectMapper> {
 
         @Override
@@ -181,10 +175,6 @@ public final class Context {
 
         initEventsModule();
 
-        if (config.hasKey(Keys.EVENT_FORWARD_URL)) {
-            eventForwarder = new EventForwarder(config);
-        }
-
     }
 
     private static void initEventsModule() {
@@ -192,6 +182,7 @@ public final class Context {
         notificationManager = new NotificationManager(
                 dataManager,
                 Main.getInjector().getInstance(CacheManager.class),
+                Main.getInjector().getInstance(EventForwarder.class),
                 Main.getInjector().getInstance(NotificatorManager.class),
                 Main.getInjector().getInstance(Geocoder.class));
         Properties velocityProperties = new Properties();
-- 
cgit v1.2.3