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/CastelProtocolDecoder.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/CastelProtocolDecoder.java')
-rw-r--r-- | src/org/traccar/protocol/CastelProtocolDecoder.java | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/org/traccar/protocol/CastelProtocolDecoder.java b/src/org/traccar/protocol/CastelProtocolDecoder.java index 9f332dd04..d3d505c86 100644 --- a/src/org/traccar/protocol/CastelProtocolDecoder.java +++ b/src/org/traccar/protocol/CastelProtocolDecoder.java @@ -15,11 +15,6 @@ */ package org.traccar.protocol; -import java.net.SocketAddress; -import java.nio.ByteOrder; -import java.nio.charset.Charset; -import java.util.LinkedList; -import java.util.List; import org.jboss.netty.buffer.ChannelBuffer; import org.jboss.netty.buffer.ChannelBuffers; import org.jboss.netty.channel.Channel; @@ -30,6 +25,12 @@ import org.traccar.helper.UnitsConverter; import org.traccar.model.Event; import org.traccar.model.Position; +import java.net.SocketAddress; +import java.nio.ByteOrder; +import java.nio.charset.StandardCharsets; +import java.util.LinkedList; +import java.util.List; + public class CastelProtocolDecoder extends BaseProtocolDecoder { public CastelProtocolDecoder(CastelProtocol protocol) { @@ -148,7 +149,7 @@ public class CastelProtocolDecoder extends BaseProtocolDecoder { ChannelBuffer id = buf.readBytes(20); int type = ChannelBuffers.swapShort(buf.readShort()); - if (!identify(id.toString(Charset.defaultCharset()).trim(), channel, remoteAddress)) { + if (!identify(id.toString(StandardCharsets.US_ASCII).trim(), channel, remoteAddress)) { return null; } |