aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornativbarak <nativ@globekeeper.com>2018-02-07 09:11:01 +0200
committernativbarak <nativ@globekeeper.com>2018-02-07 09:11:01 +0200
commitda1f01f9367e882b90b495cfae9b67d71e0cf1bb (patch)
tree69235601b205565aa06529ebf8fb1688a5578980
parent4969ecd1d16324f488f01f1f0873e101c1609302 (diff)
downloadtraccar-server-da1f01f9367e882b90b495cfae9b67d71e0cf1bb.tar.gz
traccar-server-da1f01f9367e882b90b495cfae9b67d71e0cf1bb.tar.bz2
traccar-server-da1f01f9367e882b90b495cfae9b67d71e0cf1bb.zip
fixed inline variables + test name
-rw-r--r--src/org/traccar/BasePipelineFactory.java5
-rw-r--r--test/org/traccar/WebDataHandlerTest.java2
2 files changed, 3 insertions, 4 deletions
diff --git a/src/org/traccar/BasePipelineFactory.java b/src/org/traccar/BasePipelineFactory.java
index 4407caae4..5a077da7c 100644
--- a/src/org/traccar/BasePipelineFactory.java
+++ b/src/org/traccar/BasePipelineFactory.java
@@ -238,9 +238,8 @@ public abstract class BasePipelineFactory implements ChannelPipelineFactory {
}
if (Context.getConfig().getBoolean("forward.enable")) {
- final Boolean json = Context.getConfig().getBoolean("forward.json");
- final String url = Context.getConfig().getString("forward.url");
- pipeline.addLast("webHandler", new WebDataHandler(url, json));
+ pipeline.addLast("webHandler", new WebDataHandler(Context.getConfig().getString("forward.url"),
+ Context.getConfig().getBoolean("forward.json")));
}
if (commandResultEventHandler != null) {
diff --git a/test/org/traccar/WebDataHandlerTest.java b/test/org/traccar/WebDataHandlerTest.java
index 3e79232ec..30b50d8b9 100644
--- a/test/org/traccar/WebDataHandlerTest.java
+++ b/test/org/traccar/WebDataHandlerTest.java
@@ -23,7 +23,7 @@ public class WebDataHandlerTest extends ProtocolTest {
}
@Test
- public void testBuilderRequest() throws ParseException {
+ public void testPrepareJsonPayload() throws ParseException {
Position p = position("2016-01-01 01:02:03.000", true, 20, 30);