From 5b75e0a58fbcc11a1c66448bfbd9d3466b015668 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Fri, 17 Feb 2017 06:40:17 +1300
Subject: Fix H02 frame decoder (fix #2926)

---
 src/org/traccar/protocol/H02FrameDecoder.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/org/traccar/protocol/H02FrameDecoder.java b/src/org/traccar/protocol/H02FrameDecoder.java
index ac3dbcc2e..391fccc87 100644
--- a/src/org/traccar/protocol/H02FrameDecoder.java
+++ b/src/org/traccar/protocol/H02FrameDecoder.java
@@ -50,7 +50,12 @@ public class H02FrameDecoder extends FrameDecoder {
                 // Return text message
                 int index = buf.indexOf(buf.readerIndex(), buf.writerIndex(), (byte) '#');
                 if (index != -1) {
-                    return buf.readBytes(index + 1 - buf.readerIndex());
+                    ChannelBuffer result = buf.readBytes(index + 1 - buf.readerIndex());
+                    while (buf.readable()
+                            && (buf.getByte(buf.readerIndex()) == '\r' || buf.getByte(buf.readerIndex()) == '\n')) {
+                        buf.readByte(); // skip new line
+                    }
+                    return result;
                 }
 
                 break;
-- 
cgit v1.2.3