aboutsummaryrefslogtreecommitdiff
path: root/src/org
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2015-09-26 09:55:28 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2015-09-26 09:55:28 +1200
commit6148a3c2d873f5490cc4a55bc7e326c7d293405b (patch)
treee8513bab933acfa1ea506e0457617d363990126a /src/org
parent803e4bb722560054055d989b05f86c76fabfbd2c (diff)
downloadtrackermap-server-6148a3c2d873f5490cc4a55bc7e326c7d293405b.tar.gz
trackermap-server-6148a3c2d873f5490cc4a55bc7e326c7d293405b.tar.bz2
trackermap-server-6148a3c2d873f5490cc4a55bc7e326c7d293405b.zip
Fix Aquila protocol decoder
Diffstat (limited to 'src/org')
-rw-r--r--src/org/traccar/protocol/AquilaProtocolDecoder.java5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/org/traccar/protocol/AquilaProtocolDecoder.java b/src/org/traccar/protocol/AquilaProtocolDecoder.java
index 67ada82b2..8430165ff 100644
--- a/src/org/traccar/protocol/AquilaProtocolDecoder.java
+++ b/src/org/traccar/protocol/AquilaProtocolDecoder.java
@@ -22,7 +22,6 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.jboss.netty.channel.Channel;
import org.traccar.BaseProtocolDecoder;
-import org.traccar.helper.PatternUtil;
import org.traccar.helper.UnitsConverter;
import org.traccar.model.Event;
import org.traccar.model.Position;
@@ -35,7 +34,7 @@ public class AquilaProtocolDecoder extends BaseProtocolDecoder {
private static final Pattern pattern = Pattern.compile(
"\\$\\$" +
- "CLIENT_[^,]+," + // IMEI
+ "[^,]+," + // Client
"(\\d+)," + // Device serial number
"(\\d+)," + // Event
"(-?\\d+\\.\\d+)," + // Latitude
@@ -66,8 +65,6 @@ public class AquilaProtocolDecoder extends BaseProtocolDecoder {
throws Exception {
String sentence = (String) msg;
-
- String r = PatternUtil.checkPattern(pattern.pattern(), sentence);
Matcher parser = pattern.matcher(sentence);
if (!parser.matches()) {