diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2015-06-27 17:26:33 +1200 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2015-06-27 17:26:33 +1200 |
| commit | d15ed63e4d276737a88e849c27af2876bf56a82e (patch) | |
| tree | 7d96cb4c70b4de846cb991feed3a4b2c4a618227 /src/org/traccar | |
| parent | d211474d2951d9b8e8d233b80b22419a21e2c6e1 (diff) | |
| download | trackermap-server-d15ed63e4d276737a88e849c27af2876bf56a82e.tar.gz trackermap-server-d15ed63e4d276737a88e849c27af2876bf56a82e.tar.bz2 trackermap-server-d15ed63e4d276737a88e849c27af2876bf56a82e.zip | |
Fix TR900 regex pattern (fix #1246)
Diffstat (limited to 'src/org/traccar')
| -rw-r--r-- | src/org/traccar/protocol/Tr900ProtocolDecoder.java | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/org/traccar/protocol/Tr900ProtocolDecoder.java b/src/org/traccar/protocol/Tr900ProtocolDecoder.java index e5674b262..fadca5fc6 100644 --- a/src/org/traccar/protocol/Tr900ProtocolDecoder.java +++ b/src/org/traccar/protocol/Tr900ProtocolDecoder.java @@ -15,17 +15,16 @@ */ package org.traccar.protocol; -import org.jboss.netty.channel.Channel; -import org.jboss.netty.channel.ChannelHandlerContext; -import org.traccar.BaseProtocolDecoder; -import org.traccar.model.Event; -import org.traccar.model.Position; - import java.net.SocketAddress; import java.util.Calendar; import java.util.TimeZone; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.jboss.netty.channel.Channel; +import org.jboss.netty.channel.ChannelHandlerContext; +import org.traccar.BaseProtocolDecoder; +import org.traccar.model.Event; +import org.traccar.model.Position; public class Tr900ProtocolDecoder extends BaseProtocolDecoder { @@ -53,7 +52,7 @@ public class Tr900ProtocolDecoder extends BaseProtocolDecoder { "\\d+," + // Impulses "(\\d+)," + // Input "(\\d+)" + // Status - ".*"); + ".*(?:\r\n)?"); @Override protected Object decode( |