Workaround for GT06 frame decoder

2 files changed, 14 insertions, 13 deletions

diff --git a/src/org/traccar/protocol/Gt06FrameDecoder.java b/src/org/traccar/protocol/Gt06FrameDecoder.java
index 9b93979e4..c8b5e56ae 100644
--- a/src/org/traccar/protocol/Gt06FrameDecoder.java
+++ b/src/org/traccar/protocol/Gt06FrameDecoder.java
@@ -38,17 +38,18 @@ public class Gt06FrameDecoder extends FrameDecoder {
             length += 2 + buf.getUnsignedShort(buf.readerIndex() + 2);
         }
 
-        if (buf.readableBytes() >= length) {
-            if (buf.getUnsignedShort(buf.readerIndex() + length - 2) == 0x0d0a) {
-                return buf.readBytes(length);
-            } else {
-                int endIndex = buf.indexOf(buf.readerIndex(), buf.writerIndex(), (byte) 0x0d);
-                if (endIndex > 0 && buf.writerIndex() > endIndex + 1 && buf.getByte(endIndex + 1) == 0x0a) {
-                    return buf.readBytes(endIndex + 2 - buf.readerIndex());
-                }
-            }
+        if (buf.readableBytes() >= length && buf.getUnsignedShort(buf.readerIndex() + length - 2) == 0x0d0a) {
+            return buf.readBytes(length);
         }
 
+        int endIndex = buf.readerIndex() - 1;
+        do {
+            endIndex = buf.indexOf(endIndex + 1, buf.writerIndex(), (byte) 0x0d);
+            if (endIndex > 0 && buf.writerIndex() > endIndex + 1 && buf.getByte(endIndex + 1) == 0x0a) {
+                return buf.readBytes(endIndex + 2 - buf.readerIndex());
+            }
+        } while (endIndex > 0);
+
         return null;
     }
 
diff --git a/test/org/traccar/protocol/Gt06FrameDecoderTest.java b/test/org/traccar/protocol/Gt06FrameDecoderTest.java
index 78d1eb920..ff9d4f51d 100644
--- a/test/org/traccar/protocol/Gt06FrameDecoderTest.java
+++ b/test/org/traccar/protocol/Gt06FrameDecoderTest.java
@@ -12,6 +12,10 @@ public class Gt06FrameDecoderTest extends ProtocolTest {
         Gt06FrameDecoder decoder = new Gt06FrameDecoder();
 
         Assert.assertEquals(
+                binary("78780d0103563140414198583c0d0a"),
+                decoder.decode(null, null, binary("78780d0103563140414198583c0d0a")));
+
+        Assert.assertEquals(
                 binary("787800691709261259400700cc0400d376714600d37a3d5000d37a3c5000d393505a00d3765d5a00d376735a00d32e6b640d0a"),
                 decoder.decode(null, null, binary("787800691709261259400700cc0400d376714600d37a3d5000d37a3c5000d393505a00d3765d5a00d376735a00d32e6b640d0a")));
 
@@ -24,10 +28,6 @@ public class Gt06FrameDecoderTest extends ProtocolTest {
                 decoder.decode(null, null, binary("787808171709281135331491827b75594dc8d719a9708452cad719a9708550cad719a97086521491827b75574cac9e17b308085dc8d71939633947cad71939633a480700cc0400d37a3d5a00d37a3d5a00d37a3d5a00d37a3d5a00d37a3d5a00d37a3d5a00d37a3d5a0d0a")));
 
         Assert.assertEquals(
-                binary("78781f1210020e140613cc04770690003e3f2e3414b20000000000000000044c446a0d0a"),
-                decoder.decode(null, null, binary("78781f1210020e140613cc04770690003e3f2e3414b20000000000000000044c446a0d0a")));
-
-        Assert.assertEquals(
                 binary("787808134606020002044dc5050d0a"),
                 decoder.decode(null, null, binary("787808134606020002044dc5050d0a")));