Merge branch 'master' into command_framework

1 files changed, 7 insertions, 6 deletions

diff --git a/src/org/traccar/protocol/AtrackProtocolDecoder.java b/src/org/traccar/protocol/AtrackProtocolDecoder.java
index 72a17eed2..27c5b8902 100644
--- a/src/org/traccar/protocol/AtrackProtocolDecoder.java
+++ b/src/org/traccar/protocol/AtrackProtocolDecoder.java
@@ -15,11 +15,6 @@
  */
 package org.traccar.protocol;
 
-import java.net.SocketAddress;
-import java.nio.charset.Charset;
-import java.util.Date;
-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.charset.StandardCharsets;
+import java.util.Date;
+import java.util.LinkedList;
+import java.util.List;
+
 public class AtrackProtocolDecoder extends BaseProtocolDecoder {
 
     private static final int MIN_DATA_LENGTH = 40;
@@ -72,7 +73,7 @@ public class AtrackProtocolDecoder extends BaseProtocolDecoder {
         String result = null;
         int index = buf.indexOf(buf.readerIndex(), buf.writerIndex(), (byte) 0);
         if (index > buf.readerIndex()) {
-            result = buf.readBytes(index - buf.readerIndex()).toString(Charset.defaultCharset());
+            result = buf.readBytes(index - buf.readerIndex()).toString(StandardCharsets.US_ASCII);
         }
         buf.readByte();
         return result;