aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/BasePipelineFactory.java
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2016-06-24 09:36:20 +0500
committerAbyss777 <abyss@fox5.ru>2016-06-24 09:36:20 +0500
commit52e7002ed39c333884529c3a0e8b4c6d23f0115e (patch)
tree57e93aa9381b391e0e3e18f8208a7e2b364d5c8d /src/org/traccar/BasePipelineFactory.java
parentbd2e0fdc6fe222316e9e740aa265b6d132d407b6 (diff)
downloadtrackermap-server-52e7002ed39c333884529c3a0e8b4c6d23f0115e.tar.gz
trackermap-server-52e7002ed39c333884529c3a0e8b4c6d23f0115e.tar.bz2
trackermap-server-52e7002ed39c333884529c3a0e8b4c6d23f0115e.zip
- Reverted changes in web-client
- Removed duplicate flag
Diffstat (limited to 'src/org/traccar/BasePipelineFactory.java')
-rw-r--r--src/org/traccar/BasePipelineFactory.java8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/org/traccar/BasePipelineFactory.java b/src/org/traccar/BasePipelineFactory.java
index 9de9b3a52..44f1b0657 100644
--- a/src/org/traccar/BasePipelineFactory.java
+++ b/src/org/traccar/BasePipelineFactory.java
@@ -142,11 +142,9 @@ public abstract class BasePipelineFactory implements ChannelPipelineFactory {
if (Context.getConfig().getBoolean("event.motionHandler")) {
motionEventHandler = new MotionEventHandler();
}
-
- if (Context.getConfig().getBoolean("geofence.enable")
- && Context.getConfig().getBoolean("event.geofenceHandler")) {
- geofenceEventHandler = new GeofenceEventHandler();
- }
+ }
+ if (Context.getConfig().getBoolean("event.geofenceHandler")) {
+ geofenceEventHandler = new GeofenceEventHandler();
}
}