Merge branch 'master' into command_framework

1 files changed, 3 insertions, 2 deletions

diff --git a/src/org/traccar/protocol/MeitrackFrameDecoder.java b/src/org/traccar/protocol/MeitrackFrameDecoder.java
index c2ab370a8..3c2d34394 100644
--- a/src/org/traccar/protocol/MeitrackFrameDecoder.java
+++ b/src/org/traccar/protocol/MeitrackFrameDecoder.java
@@ -15,12 +15,13 @@
  */
 package org.traccar.protocol;
 
-import java.nio.charset.Charset;
 import org.jboss.netty.buffer.ChannelBuffer;
 import org.jboss.netty.channel.Channel;
 import org.jboss.netty.channel.ChannelHandlerContext;
 import org.jboss.netty.handler.codec.frame.FrameDecoder;
 
+import java.nio.charset.StandardCharsets;
+
 public class MeitrackFrameDecoder extends FrameDecoder {
 
     @Override
@@ -34,7 +35,7 @@ public class MeitrackFrameDecoder extends FrameDecoder {
         int index = buf.indexOf(buf.readerIndex(), buf.writerIndex(), (byte) ',');
         if (index != -1) {
             int length = index - buf.readerIndex() + Integer.parseInt(
-                    buf.toString(buf.readerIndex() + 3, index - buf.readerIndex() - 3, Charset.defaultCharset()));
+                    buf.toString(buf.readerIndex() + 3, index - buf.readerIndex() - 3, StandardCharsets.US_ASCII));
             if (buf.readableBytes() >= length) {
                 return buf.readBytes(length);
             }