aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2015-02-28 09:28:16 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2015-02-28 09:28:16 +1300
commitf872b2072cfd35c51a94efc5b93b91e46129d48e (patch)
tree9265e5d023c5e8f36294949a7a2a163adaba267d /src/org/traccar
parentd13d36eda9c3115d65de353a152e36a139773f81 (diff)
downloadtrackermap-server-f872b2072cfd35c51a94efc5b93b91e46129d48e.tar.gz
trackermap-server-f872b2072cfd35c51a94efc5b93b91e46129d48e.tar.bz2
trackermap-server-f872b2072cfd35c51a94efc5b93b91e46129d48e.zip
Fix Wondex frame decoder (fix #1103)
Diffstat (limited to 'src/org/traccar')
-rw-r--r--src/org/traccar/helper/ChannelBufferTools.java4
-rw-r--r--src/org/traccar/protocol/WondexFrameDecoder.java2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/org/traccar/helper/ChannelBufferTools.java b/src/org/traccar/helper/ChannelBufferTools.java
index 0de07610d..09e3d5191 100644
--- a/src/org/traccar/helper/ChannelBufferTools.java
+++ b/src/org/traccar/helper/ChannelBufferTools.java
@@ -30,13 +30,13 @@ public class ChannelBufferTools {
public static Integer find(
ChannelBuffer buf,
Integer start,
- Integer length,
+ Integer finish,
String subString) {
int index = start;
boolean match;
- for (; index < length; index++) {
+ for (; index < finish; index++) {
match = true;
for (int i = 0; i < subString.length(); i++) {
diff --git a/src/org/traccar/protocol/WondexFrameDecoder.java b/src/org/traccar/protocol/WondexFrameDecoder.java
index ba1d41c53..09971c0d9 100644
--- a/src/org/traccar/protocol/WondexFrameDecoder.java
+++ b/src/org/traccar/protocol/WondexFrameDecoder.java
@@ -45,7 +45,7 @@ public class WondexFrameDecoder extends FrameDecoder {
} else {
- Integer index = ChannelBufferTools.find(buf, buf.readerIndex(), buf.readableBytes(), "\r\n");
+ Integer index = ChannelBufferTools.find(buf, buf.readerIndex(), buf.writerIndex(), "\r\n");
if (index != null) {
ChannelBuffer frame = buf.readBytes(index - buf.readerIndex());
buf.skipBytes(2);