aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2015-04-07 18:30:23 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2015-04-07 18:30:23 +1200
commit956e0c36b779ebe5b4cd753d6eca2d47caae9670 (patch)
tree16ca536412aa65f41703bf1ab639187325f0811f
parent2e709a88706cee2861fa53ac4dc4c5f76762e8b2 (diff)
downloadtrackermap-server-956e0c36b779ebe5b4cd753d6eca2d47caae9670.tar.gz
trackermap-server-956e0c36b779ebe5b4cd753d6eca2d47caae9670.tar.bz2
trackermap-server-956e0c36b779ebe5b4cd753d6eca2d47caae9670.zip
Fix GL200 frame decoding (fix #880)
-rw-r--r--src/org/traccar/protocol/Gl200ProtocolDecoder.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/org/traccar/protocol/Gl200ProtocolDecoder.java b/src/org/traccar/protocol/Gl200ProtocolDecoder.java
index 38ecdf4f3..1c20c5cc1 100644
--- a/src/org/traccar/protocol/Gl200ProtocolDecoder.java
+++ b/src/org/traccar/protocol/Gl200ProtocolDecoder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2012 - 2013 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2012 - 2015 Anton Tananaev (anton.tananaev@gmail.com)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -38,7 +38,7 @@ public class Gl200ProtocolDecoder extends BaseProtocolDecoder {
private static final Pattern pattern = Pattern.compile(
"(?:(?:\\+(?:RESP|BUFF):)|" +
- "(?:\\x00\\x04,\\p{XDigit}{4},[01],))" +
+ "(?:\\x00?\\x04,\\p{XDigit}{4},[01],))" +
"GT...," +
"(?:[0-9a-fA-F]{6})?," + // Protocol version
"(\\d{15}),.*," + // IMEI