aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/org/traccar/protocol/ArnaviTextProtocolDecoder.java
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2020-02-02 16:31:10 -0800
committerAnton Tananaev <anton.tananaev@gmail.com>2020-02-02 16:31:10 -0800
commit8b48d8b52f9c29a892dfe4381b3a7226226a76eb (patch)
tree46465ea547576287e16b97c2560d9b5ac4e4c1af /src/main/java/org/traccar/protocol/ArnaviTextProtocolDecoder.java
parent71735f0c9b17ad1c64a4335a196b4c765b4499c1 (diff)
downloadtraccar-server-8b48d8b52f9c29a892dfe4381b3a7226226a76eb.tar.gz
traccar-server-8b48d8b52f9c29a892dfe4381b3a7226226a76eb.tar.bz2
traccar-server-8b48d8b52f9c29a892dfe4381b3a7226226a76eb.zip
Switch between binary and text
Diffstat (limited to 'src/main/java/org/traccar/protocol/ArnaviTextProtocolDecoder.java')
-rw-r--r--src/main/java/org/traccar/protocol/ArnaviTextProtocolDecoder.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/main/java/org/traccar/protocol/ArnaviTextProtocolDecoder.java b/src/main/java/org/traccar/protocol/ArnaviTextProtocolDecoder.java
index 8c4f743bc..b99869e6e 100644
--- a/src/main/java/org/traccar/protocol/ArnaviTextProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/ArnaviTextProtocolDecoder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 - 2019 Anton Tananaev (anton@traccar.org)
+ * Copyright 2015 - 2020 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.
@@ -15,6 +15,7 @@
*/
package org.traccar.protocol;
+import io.netty.buffer.ByteBuf;
import io.netty.channel.Channel;
import org.traccar.BaseProtocolDecoder;
import org.traccar.DeviceSession;
@@ -25,6 +26,7 @@ import org.traccar.helper.PatternBuilder;
import org.traccar.model.Position;
import java.net.SocketAddress;
+import java.nio.charset.StandardCharsets;
import java.util.regex.Pattern;
public class ArnaviTextProtocolDecoder extends BaseProtocolDecoder {
@@ -65,7 +67,8 @@ public class ArnaviTextProtocolDecoder extends BaseProtocolDecoder {
protected Object decode(
Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
- Parser parser = new Parser(PATTERN, (String) msg);
+ ByteBuf buf = (ByteBuf) msg;
+ Parser parser = new Parser(PATTERN, buf.toString(StandardCharsets.US_ASCII));
if (!parser.matches()) {
return null;
}