diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2020-07-21 07:19:49 -0700 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2020-07-21 07:19:49 -0700 |
| commit | 878b809b14cf6d247305194777ddeab0bc58c2c1 (patch) | |
| tree | 357be2147e2517dfd3d374df1914914b3e493647 | |
| parent | e8741d7ddc28b9c2db3865129368f0a8eaa6b032 (diff) | |
| download | trackermap-server-878b809b14cf6d247305194777ddeab0bc58c2c1.tar.gz trackermap-server-878b809b14cf6d247305194777ddeab0bc58c2c1.tar.bz2 trackermap-server-878b809b14cf6d247305194777ddeab0bc58c2c1.zip | |
Handle empty messages
| -rw-r--r-- | src/main/java/org/traccar/protocol/EasyTrackProtocol.java | 2 | ||||
| -rw-r--r-- | src/test/java/org/traccar/protocol/EasyTrackProtocolDecoderTest.java | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/main/java/org/traccar/protocol/EasyTrackProtocol.java b/src/main/java/org/traccar/protocol/EasyTrackProtocol.java index 4626156a5..972b36077 100644 --- a/src/main/java/org/traccar/protocol/EasyTrackProtocol.java +++ b/src/main/java/org/traccar/protocol/EasyTrackProtocol.java @@ -34,7 +34,7 @@ public class EasyTrackProtocol extends BaseProtocol { addServer(new TrackerServer(false, getName()) { @Override protected void addProtocolHandlers(PipelineBuilder pipeline) { - pipeline.addLast(new CharacterDelimiterFrameDecoder(1024, "#", "\r\n")); + pipeline.addLast(new CharacterDelimiterFrameDecoder(1024, "#\r\n", "#", "\r\n")); pipeline.addLast(new StringDecoder()); pipeline.addLast(new StringEncoder()); pipeline.addLast(new EasyTrackProtocolEncoder(EasyTrackProtocol.this)); diff --git a/src/test/java/org/traccar/protocol/EasyTrackProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/EasyTrackProtocolDecoderTest.java index c86e14db2..060483f5d 100644 --- a/src/test/java/org/traccar/protocol/EasyTrackProtocolDecoderTest.java +++ b/src/test/java/org/traccar/protocol/EasyTrackProtocolDecoderTest.java @@ -11,6 +11,9 @@ public class EasyTrackProtocolDecoderTest extends ProtocolTest { EasyTrackProtocolDecoder decoder = new EasyTrackProtocolDecoder(null); verifyNull(decoder, text( + "*ET,358155100132943,MQ")); + + verifyNull(decoder, text( "*ET,354522180045564,TX,V,14070E,122336")); verifyPosition(decoder, text( |