From 4ecca566c4faba5f526b92d5920f542a5b03cc95 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Sat, 5 Oct 2019 14:34:01 -0700
Subject: Fix frame decoding

---
 src/main/java/org/traccar/protocol/Jt600ProtocolDecoder.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/main/java/org/traccar/protocol/Jt600ProtocolDecoder.java')

diff --git a/src/main/java/org/traccar/protocol/Jt600ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Jt600ProtocolDecoder.java
index 82abeb42e..f456cd1ef 100644
--- a/src/main/java/org/traccar/protocol/Jt600ProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/Jt600ProtocolDecoder.java
@@ -86,13 +86,17 @@ public class Jt600ProtocolDecoder extends BaseProtocolDecoder {
 
     }
 
+    static boolean isLongFormat(ByteBuf buf, int flagIndex) {
+        return buf.getUnsignedByte(flagIndex) >> 4 == 0x7;
+    }
+
     private List<Position> decodeBinary(ByteBuf buf, Channel channel, SocketAddress remoteAddress) {
 
         List<Position> positions = new LinkedList<>();
 
         buf.readByte(); // header
 
-        boolean longFormat = buf.getUnsignedByte(buf.readerIndex()) >> 4 == 0x7;
+        boolean longFormat = isLongFormat(buf, buf.readerIndex());
 
         String id = String.valueOf(Long.parseLong(ByteBufUtil.hexDump(buf.readSlice(5))));
         DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, id);
-- 
cgit v1.2.3