diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2018-06-06 23:14:56 +1200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-06 23:14:56 +1200 |
commit | 6520327938582d5e4928d78fc70f95c60e9ac909 (patch) | |
tree | e9c8e8e14d5e8db8271475fdd0d511adc320aee6 /src/org/traccar/protocol/WondexFrameDecoder.java | |
parent | 681b8f42633d7c6741e6fbac4308ba25c4aff9fa (diff) | |
parent | c8028d9b85dd9a5cf6f75de6be64a7aadf56e9a6 (diff) | |
download | trackermap-server-6520327938582d5e4928d78fc70f95c60e9ac909.tar.gz trackermap-server-6520327938582d5e4928d78fc70f95c60e9ac909.tar.bz2 trackermap-server-6520327938582d5e4928d78fc70f95c60e9ac909.zip |
Merge pull request #3913 from Abyss777/netty4_yxw
Migrate Y, X, W protocols
Diffstat (limited to 'src/org/traccar/protocol/WondexFrameDecoder.java')
-rw-r--r-- | src/org/traccar/protocol/WondexFrameDecoder.java | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/org/traccar/protocol/WondexFrameDecoder.java b/src/org/traccar/protocol/WondexFrameDecoder.java index c17bcd078..b09306b57 100644 --- a/src/org/traccar/protocol/WondexFrameDecoder.java +++ b/src/org/traccar/protocol/WondexFrameDecoder.java @@ -15,14 +15,11 @@ */ package org.traccar.protocol; -import java.nio.charset.StandardCharsets; - import org.traccar.BaseFrameDecoder; import org.traccar.NetworkMessage; +import org.traccar.helper.BufferUtil; 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; @@ -49,8 +46,7 @@ public class WondexFrameDecoder extends BaseFrameDecoder { } else { - ByteBuf delimiter = Unpooled.wrappedBuffer("\r\n".getBytes(StandardCharsets.US_ASCII)); - int index = ByteBufUtil.indexOf(delimiter, buf); + int index = BufferUtil.indexOf("\r\n", buf); if (index != -1) { ByteBuf frame = buf.readBytes(index - buf.readerIndex()); buf.skipBytes(2); |