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/NoranProtocolEncoder.java | |
parent | 5bf82eff1ecac7b23661cea14be26aa7a3e4d09a (diff) | |
parent | 59f466092c9c875c2bbcb70a2a402aad0edd7639 (diff) | |
download | trackermap-server-516ef6a30eb59e1b9c3aa297e3595c5acf665530.tar.gz trackermap-server-516ef6a30eb59e1b9c3aa297e3595c5acf665530.tar.bz2 trackermap-server-516ef6a30eb59e1b9c3aa297e3595c5acf665530.zip |
Merge branch 'master' into command_framework
Diffstat (limited to 'src/org/traccar/protocol/NoranProtocolEncoder.java')
-rw-r--r-- | src/org/traccar/protocol/NoranProtocolEncoder.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/org/traccar/protocol/NoranProtocolEncoder.java b/src/org/traccar/protocol/NoranProtocolEncoder.java index 6a5bfdcb2..1f1988802 100644 --- a/src/org/traccar/protocol/NoranProtocolEncoder.java +++ b/src/org/traccar/protocol/NoranProtocolEncoder.java @@ -22,7 +22,7 @@ import org.traccar.helper.Log; import org.traccar.model.Command; import java.nio.ByteOrder; -import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; public class NoranProtocolEncoder extends BaseProtocolEncoder { @@ -31,16 +31,16 @@ public class NoranProtocolEncoder extends BaseProtocolEncoder { ChannelBuffer buf = ChannelBuffers.buffer(ByteOrder.LITTLE_ENDIAN, 12 + 56); buf.writeBytes( - ChannelBuffers.copiedBuffer(ByteOrder.LITTLE_ENDIAN, "\r\n*KW", Charset.defaultCharset())); + ChannelBuffers.copiedBuffer(ByteOrder.LITTLE_ENDIAN, "\r\n*KW", StandardCharsets.US_ASCII)); buf.writeByte(0); buf.writeShort(buf.capacity()); buf.writeShort(NoranProtocolDecoder.MSG_CONTROL); buf.writeInt(0); // gis ip buf.writeShort(0); // gis port - buf.writeBytes(content.getBytes(Charset.defaultCharset())); + buf.writeBytes(content.getBytes(StandardCharsets.US_ASCII)); buf.writerIndex(buf.writerIndex() + 50 - content.length()); buf.writeBytes( - ChannelBuffers.copiedBuffer(ByteOrder.LITTLE_ENDIAN, "\r\n", Charset.defaultCharset())); + ChannelBuffers.copiedBuffer(ByteOrder.LITTLE_ENDIAN, "\r\n", StandardCharsets.US_ASCII)); return buf; } |