1 files changed, 14 insertions, 1 deletions
diff --git a/src/main/java/org/traccar/Context.java b/src/main/java/org/traccar/Context.java
index aeba9c4c9..ee14f8a1a 100644
--- a/src/main/java/org/traccar/Context.java
+++ b/src/main/java/org/traccar/Context.java
@@ -20,6 +20,7 @@ import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.datatype.jsr353.JSR353Module;
 import org.apache.velocity.app.VelocityEngine;
 import org.eclipse.jetty.util.URIUtil;
+import org.traccar.broadcast.BroadcastService;
 import org.traccar.config.Config;
 import org.traccar.config.Keys;
 import org.traccar.database.AttributesManager;
@@ -171,6 +172,12 @@ public final class Context {
         return scheduleManager;
     }
 
+    private static BroadcastService broadcastService;
+
+    public static BroadcastService getBroadcastService() {
+        return broadcastService;
+    }
+
     private static GeofenceManager geofenceManager;
 
     public static GeofenceManager getGeofenceManager() {
@@ -287,7 +294,9 @@ public final class Context {
         }
 
         objectMapper = new ObjectMapper();
-        objectMapper.registerModule(new SanitizerModule());
+        if (config.getBoolean(Keys.WEB_SANITIZE)) {
+            objectMapper.registerModule(new SanitizerModule());
+        }
         objectMapper.registerModule(new JSR353Module());
         objectMapper.setConfig(
                 objectMapper.getSerializationConfig().without(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS));
@@ -335,6 +344,10 @@ public final class Context {
         serverManager = new ServerManager();
         scheduleManager = new ScheduleManager();
 
+        if (config.hasKey(Keys.BROADCAST_ADDRESS)) {
+            broadcastService = new BroadcastService(config, objectMapper);
+        }
+
         if (config.hasKey(Keys.EVENT_FORWARD_URL)) {
             eventForwarder = new EventForwarder();
         }