1 files changed, 9 insertions, 0 deletions
diff --git a/src/org/traccar/BasePipelineFactory.java b/src/org/traccar/BasePipelineFactory.java
index fcb6266ef..1f18ce48e 100644
--- a/src/org/traccar/BasePipelineFactory.java
+++ b/src/org/traccar/BasePipelineFactory.java
@@ -32,6 +32,7 @@ public abstract class BasePipelineFactory implements ChannelPipelineFactory {
 
     private final TrackerServer server;
     private FilterHandler filterHandler;
+    private AlertHandler alertHandler;
     private Integer resetDelay;
     private Boolean processInvalidPositions;
 
@@ -93,6 +94,11 @@ public abstract class BasePipelineFactory implements ChannelPipelineFactory {
         if (enableFilter != null && Boolean.valueOf(enableFilter)) {
             filterHandler = new FilterHandler();
         }
+        
+        String enableAlerts = Context.getProps().getProperty("alert.enable");
+        if(enableAlerts != null && Boolean.valueOf(enableAlerts)){
+            alertHandler = new AlertHandler();
+        }
 
         if (Context.getReverseGeocoder() != null) {
             // Default behavior is to process invalid positions (i.e., the "null" case)
@@ -117,6 +123,9 @@ public abstract class BasePipelineFactory implements ChannelPipelineFactory {
         if (filterHandler != null) {
             pipeline.addLast("filter", filterHandler);
         }
+        if (alertHandler != null) {
+            pipeline.addLast("alert", alertHandler);
+        }
         if (Context.getReverseGeocoder() != null) {
             pipeline.addLast("geocoder", new ReverseGeocoderHandler(Context.getReverseGeocoder(), processInvalidPositions));
         }