aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/org/traccar
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2022-01-22 18:27:02 -0800
committerAnton Tananaev <anton.tananaev@gmail.com>2022-01-22 18:27:02 -0800
commita8af4b7d0b7eec1e3076bd51bc2e81c6df0626ac (patch)
tree3d0f2db26a0274f54279501e32ccf74cd19ff0f1 /src/main/java/org/traccar
parentb918660950f459959c3a975c558448c907d6a3b4 (diff)
downloadtrackermap-server-a8af4b7d0b7eec1e3076bd51bc2e81c6df0626ac.tar.gz
trackermap-server-a8af4b7d0b7eec1e3076bd51bc2e81c6df0626ac.tar.bz2
trackermap-server-a8af4b7d0b7eec1e3076bd51bc2e81c6df0626ac.zip
Update Armoli frame decoder
Diffstat (limited to 'src/main/java/org/traccar')
-rw-r--r--src/main/java/org/traccar/protocol/ArmoliProtocol.java2
-rw-r--r--src/main/java/org/traccar/protocol/ArmoliProtocolDecoder.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/org/traccar/protocol/ArmoliProtocol.java b/src/main/java/org/traccar/protocol/ArmoliProtocol.java
index 7ee4289b0..dec8c6fe0 100644
--- a/src/main/java/org/traccar/protocol/ArmoliProtocol.java
+++ b/src/main/java/org/traccar/protocol/ArmoliProtocol.java
@@ -28,7 +28,7 @@ public class ArmoliProtocol extends BaseProtocol {
addServer(new TrackerServer(false, getName()) {
@Override
protected void addProtocolHandlers(PipelineBuilder pipeline) {
- pipeline.addLast(new CharacterDelimiterFrameDecoder(1024, '\r'));
+ pipeline.addLast(new CharacterDelimiterFrameDecoder(1024, ";\r", ";"));
pipeline.addLast(new StringEncoder());
pipeline.addLast(new StringDecoder());
pipeline.addLast(new ArmoliProtocolDecoder(ArmoliProtocol.this));
diff --git a/src/main/java/org/traccar/protocol/ArmoliProtocolDecoder.java b/src/main/java/org/traccar/protocol/ArmoliProtocolDecoder.java
index b1140d79c..400e4ad89 100644
--- a/src/main/java/org/traccar/protocol/ArmoliProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/ArmoliProtocolDecoder.java
@@ -78,7 +78,7 @@ public class ArmoliProtocolDecoder extends BaseProtocolDecoder {
getLastLocation(position, null);
position.set(
Position.KEY_RESULT,
- sentence.substring(sentence.indexOf(',') + 1, sentence.length() - 2));
+ sentence.substring(sentence.indexOf(',') + 1, sentence.length() - 1));
return position;
}
} else if (channel != null && (type == 'Q' || type == 'L')) {