aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/protocol/AtrackFrameDecoder.java
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2018-06-06 15:57:45 +0500
committerAbyss777 <abyss@fox5.ru>2018-06-06 16:07:08 +0500
commitc8028d9b85dd9a5cf6f75de6be64a7aadf56e9a6 (patch)
treee9c8e8e14d5e8db8271475fdd0d511adc320aee6 /src/org/traccar/protocol/AtrackFrameDecoder.java
parent681b8f42633d7c6741e6fbac4308ba25c4aff9fa (diff)
downloadtrackermap-server-c8028d9b85dd9a5cf6f75de6be64a7aadf56e9a6.tar.gz
trackermap-server-c8028d9b85dd9a5cf6f75de6be64a7aadf56e9a6.tar.bz2
trackermap-server-c8028d9b85dd9a5cf6f75de6be64a7aadf56e9a6.zip
- Migrate X,Y,W protocols
- Add BufferUtil helper class
Diffstat (limited to 'src/org/traccar/protocol/AtrackFrameDecoder.java')
-rw-r--r--src/org/traccar/protocol/AtrackFrameDecoder.java8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/org/traccar/protocol/AtrackFrameDecoder.java b/src/org/traccar/protocol/AtrackFrameDecoder.java
index a37b5d0f8..4e1758f2d 100644
--- a/src/org/traccar/protocol/AtrackFrameDecoder.java
+++ b/src/org/traccar/protocol/AtrackFrameDecoder.java
@@ -16,13 +16,10 @@
package org.traccar.protocol;
import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufUtil;
-import io.netty.buffer.Unpooled;
import io.netty.channel.Channel;
import io.netty.channel.ChannelHandlerContext;
import org.traccar.BaseFrameDecoder;
-
-import java.nio.charset.StandardCharsets;
+import org.traccar.helper.BufferUtil;
public class AtrackFrameDecoder extends BaseFrameDecoder {
@@ -51,8 +48,7 @@ public class AtrackFrameDecoder extends BaseFrameDecoder {
} else {
- ByteBuf delimiter = Unpooled.wrappedBuffer("\r\n".getBytes(StandardCharsets.US_ASCII));
- int endIndex = ByteBufUtil.indexOf(delimiter, buf);
+ int endIndex = BufferUtil.indexOf("\r\n", buf);
if (endIndex > 0) {
return buf.readBytes(endIndex - buf.readerIndex() + 2);
}