From 878b809b14cf6d247305194777ddeab0bc58c2c1 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Tue, 21 Jul 2020 07:19:49 -0700 Subject: Handle empty messages --- src/main/java/org/traccar/protocol/EasyTrackProtocol.java | 2 +- src/test/java/org/traccar/protocol/EasyTrackProtocolDecoderTest.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) 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 @@ -10,6 +10,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")); -- cgit v1.2.3