Fix buffer reference issues

1 files changed, 4 insertions, 4 deletions

diff --git a/src/main/java/org/traccar/protocol/RetranslatorProtocolDecoder.java b/src/main/java/org/traccar/protocol/RetranslatorProtocolDecoder.java
index 0688c9b0e..5bf6cef50 100644
--- a/src/main/java/org/traccar/protocol/RetranslatorProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/RetranslatorProtocolDecoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Anton Tananaev (anton@traccar.org)
+ * Copyright 2018 - 2019 Anton Tananaev (anton@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,7 +47,7 @@ public class RetranslatorProtocolDecoder extends BaseProtocolDecoder {
         buf.readUnsignedInt(); // length
 
         int idLength = buf.indexOf(buf.readerIndex(), buf.writerIndex(), (byte) 0x00) - buf.readerIndex();
-        String id = buf.readBytes(idLength).toString(StandardCharsets.US_ASCII);
+        String id = buf.readCharSequence(idLength, StandardCharsets.US_ASCII).toString();
         buf.readByte();
         DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, id);
         if (deviceSession == null) {
@@ -68,7 +68,7 @@ public class RetranslatorProtocolDecoder extends BaseProtocolDecoder {
             int dataType = buf.readUnsignedByte();
 
             int nameLength = buf.indexOf(buf.readerIndex(), buf.writerIndex(), (byte) 0x00) - buf.readerIndex();
-            String name = buf.readBytes(nameLength).toString(StandardCharsets.US_ASCII);
+            String name = buf.readCharSequence(nameLength, StandardCharsets.US_ASCII).toString();
             buf.readByte();
 
             if (name.equals("posinfo")) {
@@ -83,7 +83,7 @@ public class RetranslatorProtocolDecoder extends BaseProtocolDecoder {
                 switch (dataType) {
                     case 1:
                         int len = buf.indexOf(buf.readerIndex(), buf.writerIndex(), (byte) 0x00) - buf.readerIndex();
-                        position.set(name, buf.readBytes(len).toString(StandardCharsets.US_ASCII));
+                        position.set(name, buf.readCharSequence(len, StandardCharsets.US_ASCII).toString());
                         buf.readByte();
                         break;
                     case 3: