Merge branch 'master' into command_framework

1 files changed, 5 insertions, 4 deletions

diff --git a/src/org/traccar/protocol/RitiProtocolDecoder.java b/src/org/traccar/protocol/RitiProtocolDecoder.java
index 1b95bb8f6..5db126a83 100644
--- a/src/org/traccar/protocol/RitiProtocolDecoder.java
+++ b/src/org/traccar/protocol/RitiProtocolDecoder.java
@@ -15,9 +15,6 @@
  */
 package org.traccar.protocol;
 
-import java.net.SocketAddress;
-import java.nio.charset.Charset;
-import java.util.regex.Pattern;
 import org.jboss.netty.buffer.ChannelBuffer;
 import org.jboss.netty.channel.Channel;
 import org.traccar.BaseProtocolDecoder;
@@ -27,6 +24,10 @@ import org.traccar.helper.PatternBuilder;
 import org.traccar.model.Event;
 import org.traccar.model.Position;
 
+import java.net.SocketAddress;
+import java.nio.charset.StandardCharsets;
+import java.util.regex.Pattern;
+
 public class RitiProtocolDecoder extends BaseProtocolDecoder {
 
     public RitiProtocolDecoder(RitiProtocol protocol) {
@@ -76,7 +77,7 @@ public class RitiProtocolDecoder extends BaseProtocolDecoder {
 
         // Parse GPRMC
         int end = buf.indexOf(buf.readerIndex(), buf.writerIndex(), (byte) '*');
-        String gprmc = buf.toString(buf.readerIndex(), end - buf.readerIndex(), Charset.defaultCharset());
+        String gprmc = buf.toString(buf.readerIndex(), end - buf.readerIndex(), StandardCharsets.US_ASCII);
         Parser parser = new Parser(PATTERN, gprmc);
         if (!parser.matches()) {
             return null;