diff options
| author | Gabor Somogyi <Gabor_Somogyi@epam.com> | 2016-05-04 14:36:18 +0200 |
|---|---|---|
| committer | Gabor Somogyi <Gabor_Somogyi@epam.com> | 2016-05-04 14:39:03 +0200 |
| commit | 516ef6a30eb59e1b9c3aa297e3595c5acf665530 (patch) | |
| tree | 2bed5e621be4786816bbf3d6adabe41d2d43fbdb /src/org/traccar/protocol/MegastekFrameDecoder.java | |
| parent | 5bf82eff1ecac7b23661cea14be26aa7a3e4d09a (diff) | |
| parent | 59f466092c9c875c2bbcb70a2a402aad0edd7639 (diff) | |
| download | traccar-server-516ef6a30eb59e1b9c3aa297e3595c5acf665530.tar.gz traccar-server-516ef6a30eb59e1b9c3aa297e3595c5acf665530.tar.bz2 traccar-server-516ef6a30eb59e1b9c3aa297e3595c5acf665530.zip | |
Merge branch 'master' into command_framework
Diffstat (limited to 'src/org/traccar/protocol/MegastekFrameDecoder.java')
| -rw-r--r-- | src/org/traccar/protocol/MegastekFrameDecoder.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/org/traccar/protocol/MegastekFrameDecoder.java b/src/org/traccar/protocol/MegastekFrameDecoder.java index a53468017..ba2cc1d25 100644 --- a/src/org/traccar/protocol/MegastekFrameDecoder.java +++ b/src/org/traccar/protocol/MegastekFrameDecoder.java @@ -21,7 +21,7 @@ import org.jboss.netty.channel.ChannelHandlerContext; import org.jboss.netty.handler.codec.frame.FrameDecoder; import org.traccar.helper.StringFinder; -import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; public class MegastekFrameDecoder extends FrameDecoder { @@ -34,7 +34,7 @@ public class MegastekFrameDecoder extends FrameDecoder { } if (Character.isDigit(buf.getByte(buf.readerIndex()))) { - int length = 4 + Integer.parseInt(buf.toString(buf.readerIndex(), 4, Charset.defaultCharset())); + int length = 4 + Integer.parseInt(buf.toString(buf.readerIndex(), 4, StandardCharsets.US_ASCII)); if (buf.readableBytes() >= length) { return buf.readBytes(length); } |