From 0d064e99c1078fe9deb1658d1daa6802ff4685e5 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Mon, 26 Oct 2015 12:38:54 +1300
Subject: Modify PT502 frame decoder

---
 src/org/traccar/protocol/Pt502FrameDecoder.java | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

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

diff --git a/src/org/traccar/protocol/Pt502FrameDecoder.java b/src/org/traccar/protocol/Pt502FrameDecoder.java
index 891265c84..8b5b6f791 100644
--- a/src/org/traccar/protocol/Pt502FrameDecoder.java
+++ b/src/org/traccar/protocol/Pt502FrameDecoder.java
@@ -27,9 +27,7 @@ public class Pt502FrameDecoder extends FrameDecoder {
 
     @Override
     protected Object decode(
-            ChannelHandlerContext ctx,
-            Channel channel,
-            ChannelBuffer buf) throws Exception {
+            ChannelHandlerContext ctx, Channel channel, ChannelBuffer buf) throws Exception {
 
         if (buf.readableBytes() < BINARY_HEADER) {
             return null;
@@ -47,8 +45,8 @@ public class Pt502FrameDecoder extends FrameDecoder {
 
         } else {
 
-            Integer index = ChannelBufferTools.find(buf, 0, buf.readableBytes(), "\n");
-            if (index != null) {
+            int index = buf.indexOf(buf.readerIndex(), buf.writerIndex(), (byte) '\n');
+            if (index != -1) {
                 ChannelBuffer result = buf.readBytes(index - 1);
                 buf.skipBytes(2);
                 return result;
-- 
cgit v1.2.3