aboutsummaryrefslogtreecommitdiff
path: root/src/org
diff options
context:
space:
mode:
Diffstat (limited to 'src/org')
-rw-r--r--src/org/traccar/BasePipelineFactory.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/org/traccar/BasePipelineFactory.java b/src/org/traccar/BasePipelineFactory.java
index 775d609a7..33f778885 100644
--- a/src/org/traccar/BasePipelineFactory.java
+++ b/src/org/traccar/BasePipelineFactory.java
@@ -112,9 +112,12 @@ public abstract class BasePipelineFactory implements ChannelPipelineFactory {
public BasePipelineFactory(TrackerServer server, String protocol) {
this.server = server;
- timeout = Context.getConfig().getInteger(protocol + ".timeout", 0);
+ timeout = Context.getConfig().getInteger(protocol + ".timeout");
if (timeout == 0) {
- timeout = Context.getConfig().getInteger(protocol + ".resetDelay", 0); // temporary
+ timeout = Context.getConfig().getInteger(protocol + ".resetDelay"); // temporary
+ if (timeout == 0) {
+ timeout = Context.getConfig().getInteger("server.timeout");
+ }
}
if (Context.getConfig().getBoolean("filter.enable")) {