diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2016-05-04 13:26:16 +1200 |
---|---|---|
committer | Anton Tananaev <anton.tananaev@gmail.com> | 2016-05-04 13:26:16 +1200 |
commit | 4b4d68a4e6ee3bad66e00bd9905c572ad9c7b91b (patch) | |
tree | 2b6d67fa7164d6b0cb41d3c5162556818b53cd1c /src/org/traccar/protocol/SkypatrolProtocolDecoder.java | |
parent | 2d920ecec746615281802e068044a3122a0ae90b (diff) | |
download | trackermap-server-4b4d68a4e6ee3bad66e00bd9905c572ad9c7b91b.tar.gz trackermap-server-4b4d68a4e6ee3bad66e00bd9905c572ad9c7b91b.tar.bz2 trackermap-server-4b4d68a4e6ee3bad66e00bd9905c572ad9c7b91b.zip |
Explicitly use ASCII charset
Diffstat (limited to 'src/org/traccar/protocol/SkypatrolProtocolDecoder.java')
-rw-r--r-- | src/org/traccar/protocol/SkypatrolProtocolDecoder.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/org/traccar/protocol/SkypatrolProtocolDecoder.java b/src/org/traccar/protocol/SkypatrolProtocolDecoder.java index 262bafa6e..087dc8841 100644 --- a/src/org/traccar/protocol/SkypatrolProtocolDecoder.java +++ b/src/org/traccar/protocol/SkypatrolProtocolDecoder.java @@ -15,8 +15,6 @@ */ package org.traccar.protocol; -import java.net.SocketAddress; -import java.nio.charset.Charset; import org.jboss.netty.buffer.ChannelBuffer; import org.jboss.netty.channel.Channel; import org.traccar.BaseProtocolDecoder; @@ -27,6 +25,9 @@ import org.traccar.helper.Log; import org.traccar.model.Event; import org.traccar.model.Position; +import java.net.SocketAddress; +import java.nio.charset.StandardCharsets; + public class SkypatrolProtocolDecoder extends BaseProtocolDecoder { private final long defaultMask; @@ -75,10 +76,10 @@ public class SkypatrolProtocolDecoder extends BaseProtocolDecoder { String id; if (BitUtil.check(mask, 23)) { - id = buf.toString(buf.readerIndex(), 8, Charset.defaultCharset()).trim(); + id = buf.toString(buf.readerIndex(), 8, StandardCharsets.US_ASCII).trim(); buf.skipBytes(8); } else if (BitUtil.check(mask, 2)) { - id = buf.toString(buf.readerIndex(), 22, Charset.defaultCharset()).trim(); + id = buf.toString(buf.readerIndex(), 22, StandardCharsets.US_ASCII).trim(); buf.skipBytes(22); } else { Log.warning("No device id field"); |