aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2014-06-19 22:47:06 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2014-06-19 22:47:06 +1200
commitf09fc2f40d61c08daa1a28aa03ebe23fe336c8ee (patch)
tree1749724f962a7ff64e2a7264b1a364b37552149a
parent2034139e1f64ceee146d376e3eb01915b0f86239 (diff)
downloadtrackermap-server-f09fc2f40d61c08daa1a28aa03ebe23fe336c8ee.tar.gz
trackermap-server-f09fc2f40d61c08daa1a28aa03ebe23fe336c8ee.tar.bz2
trackermap-server-f09fc2f40d61c08daa1a28aa03ebe23fe336c8ee.zip
Trim line breaks in TLT2H decoder
-rw-r--r--src/org/traccar/protocol/Tlt2hProtocolDecoder.java1
-rw-r--r--test/org/traccar/protocol/Tlt2hProtocolDecoderTest.java4
2 files changed, 5 insertions, 0 deletions
diff --git a/src/org/traccar/protocol/Tlt2hProtocolDecoder.java b/src/org/traccar/protocol/Tlt2hProtocolDecoder.java
index c8671bc54..e4e6cb300 100644
--- a/src/org/traccar/protocol/Tlt2hProtocolDecoder.java
+++ b/src/org/traccar/protocol/Tlt2hProtocolDecoder.java
@@ -62,6 +62,7 @@ public class Tlt2hProtocolDecoder extends BaseProtocolDecoder {
throws Exception {
String sentence = (String) msg;
+ sentence = sentence.trim();
// Decode header
String header = sentence.substring(0, sentence.indexOf('\r'));
diff --git a/test/org/traccar/protocol/Tlt2hProtocolDecoderTest.java b/test/org/traccar/protocol/Tlt2hProtocolDecoderTest.java
index 0a7dede6c..350df23b4 100644
--- a/test/org/traccar/protocol/Tlt2hProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/Tlt2hProtocolDecoderTest.java
@@ -15,6 +15,10 @@ public class Tlt2hProtocolDecoderTest {
verify(decoder.decode(null, null,
"#357671030946351#V500#0000#AUTO#1\r\n" +
"#$GPRMC,223835.000,A,0615.3545,S,10708.5779,E,14.62,97.41,070313,,,D*70\r\n"));
+
+ verify(decoder.decode(null, null,
+ "\r\n#357671030946351#V500#0000#AUTO#1\r\n" +
+ "#$GPRMC,223835.000,A,0615.3545,S,10708.5779,E,14.62,97.41,070313,,,D*70\r\n"));
verify(decoder.decode(null, null,
"#357671030938911#V500#0000#AUTOSTOP#1\r\n" +