1 files changed, 11 insertions, 11 deletions
diff --git a/src/org/traccar/protocol/AtrackFrameDecoder.java b/src/org/traccar/protocol/AtrackFrameDecoder.java
index 224679bde..3d33d9862 100644
--- a/src/org/traccar/protocol/AtrackFrameDecoder.java
+++ b/src/org/traccar/protocol/AtrackFrameDecoder.java
@@ -15,26 +15,26 @@
  */
 package org.traccar.protocol;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.handler.codec.frame.FrameDecoder;
-import org.traccar.helper.StringFinder;
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import org.traccar.BaseFrameDecoder;
+import org.traccar.helper.BufferUtil;
 
-public class AtrackFrameDecoder extends FrameDecoder {
+public class AtrackFrameDecoder extends BaseFrameDecoder {
 
     private static final int KEEPALIVE_LENGTH = 12;
 
     @Override
     protected Object decode(
-            ChannelHandlerContext ctx, Channel channel, ChannelBuffer buf) throws Exception {
+            ChannelHandlerContext ctx, Channel channel, ByteBuf buf) throws Exception {
 
         if (buf.readableBytes() >= 2) {
 
             if (buf.getUnsignedShort(buf.readerIndex()) == 0xfe02) {
 
                 if (buf.readableBytes() >= KEEPALIVE_LENGTH) {
-                    return buf.readBytes(KEEPALIVE_LENGTH);
+                    return buf.readRetainedSlice(KEEPALIVE_LENGTH);
                 }
 
             } else if (buf.getUnsignedShort(buf.readerIndex()) == 0x4050 && buf.getByte(buf.readerIndex() + 2) != ',') {
@@ -42,15 +42,15 @@ public class AtrackFrameDecoder extends FrameDecoder {
                 if (buf.readableBytes() > 6) {
                     int length = buf.getUnsignedShort(buf.readerIndex() + 4) + 4 + 2;
                     if (buf.readableBytes() >= length) {
-                        return buf.readBytes(length);
+                        return buf.readRetainedSlice(length);
                     }
                 }
 
             } else {
 
-                int endIndex = buf.indexOf(buf.readerIndex(), buf.writerIndex(), new StringFinder("\r\n"));
+                int endIndex = BufferUtil.indexOf("\r\n", buf);
                 if (endIndex > 0) {
-                    return buf.readBytes(endIndex - buf.readerIndex() + 2);
+                    return buf.readRetainedSlice(endIndex - buf.readerIndex() + 2);
                 }
 
             }