aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/protocol/TotemFrameDecoder.java
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2018-06-09 00:11:14 +1200
committerGitHub <noreply@github.com>2018-06-09 00:11:14 +1200
commit46274ffddf31d0f09a7c370b2e374f53f6ecc2b6 (patch)
tree8d0869a71665898524fc67bfb5940a21a73c07e5 /src/org/traccar/protocol/TotemFrameDecoder.java
parentfb543fb413652f4cb0408a6caafbdd7f4a4ca369 (diff)
parentc176b7b4bf4eef6f71767f92ada2591ef27c1cfa (diff)
downloadtrackermap-server-46274ffddf31d0f09a7c370b2e374f53f6ecc2b6.tar.gz
trackermap-server-46274ffddf31d0f09a7c370b2e374f53f6ecc2b6.tar.bz2
trackermap-server-46274ffddf31d0f09a7c370b2e374f53f6ecc2b6.zip
Merge pull request #3921 from Abyss777/netty4_tz-tl
Migrate part of T protocols
Diffstat (limited to 'src/org/traccar/protocol/TotemFrameDecoder.java')
-rw-r--r--src/org/traccar/protocol/TotemFrameDecoder.java19
1 files changed, 10 insertions, 9 deletions
diff --git a/src/org/traccar/protocol/TotemFrameDecoder.java b/src/org/traccar/protocol/TotemFrameDecoder.java
index 70dc5db3b..a7e134c09 100644
--- a/src/org/traccar/protocol/TotemFrameDecoder.java
+++ b/src/org/traccar/protocol/TotemFrameDecoder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2013 - 2017 Anton Tananaev (anton@traccar.org)
+ * Copyright 2013 - 2018 Anton Tananaev (anton@traccar.org)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -15,25 +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 java.nio.charset.StandardCharsets;
-public class TotemFrameDecoder extends FrameDecoder {
+import org.traccar.BaseFrameDecoder;
+import org.traccar.helper.BufferUtil;
+
+public class TotemFrameDecoder extends BaseFrameDecoder {
@Override
protected Object decode(
- ChannelHandlerContext ctx, Channel channel, ChannelBuffer buf) throws Exception {
+ ChannelHandlerContext ctx, Channel channel, ByteBuf buf) throws Exception {
if (buf.readableBytes() < 10) {
return null;
}
- int beginIndex = buf.indexOf(buf.readerIndex(), buf.writerIndex(), new StringFinder("$$"));
+ int beginIndex = BufferUtil.indexOf("$$", buf);
if (beginIndex == -1) {
return null;
} else if (beginIndex > buf.readerIndex()) {