aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/protocol/AdmProtocolDecoder.java
diff options
context:
space:
mode:
authorGabor Somogyi <Gabor_Somogyi@epam.com>2016-05-04 14:36:18 +0200
committerGabor Somogyi <Gabor_Somogyi@epam.com>2016-05-04 14:39:03 +0200
commit516ef6a30eb59e1b9c3aa297e3595c5acf665530 (patch)
tree2bed5e621be4786816bbf3d6adabe41d2d43fbdb /src/org/traccar/protocol/AdmProtocolDecoder.java
parent5bf82eff1ecac7b23661cea14be26aa7a3e4d09a (diff)
parent59f466092c9c875c2bbcb70a2a402aad0edd7639 (diff)
downloadtrackermap-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/AdmProtocolDecoder.java')
-rw-r--r--src/org/traccar/protocol/AdmProtocolDecoder.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/org/traccar/protocol/AdmProtocolDecoder.java b/src/org/traccar/protocol/AdmProtocolDecoder.java
index 374dd8995..28d0b5105 100644
--- a/src/org/traccar/protocol/AdmProtocolDecoder.java
+++ b/src/org/traccar/protocol/AdmProtocolDecoder.java
@@ -24,7 +24,7 @@ import org.traccar.model.Event;
import org.traccar.model.Position;
import java.net.SocketAddress;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import java.util.Date;
public class AdmProtocolDecoder extends BaseProtocolDecoder {
@@ -49,7 +49,7 @@ public class AdmProtocolDecoder extends BaseProtocolDecoder {
int type = buf.readUnsignedByte();
if (type == MSG_IMEI) {
- identify(buf.toString(buf.readerIndex(), 15, Charset.defaultCharset()), channel, remoteAddress);
+ identify(buf.toString(buf.readerIndex(), 15, StandardCharsets.US_ASCII), channel, remoteAddress);
}
if (hasDeviceId() && BitUtil.to(type, 2) == 0) {