From d15ed63e4d276737a88e849c27af2876bf56a82e Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Sat, 27 Jun 2015 17:26:33 +1200
Subject: Fix TR900 regex pattern (fix #1246)

---
 src/org/traccar/protocol/Tr900ProtocolDecoder.java | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'src/org/traccar/protocol/Tr900ProtocolDecoder.java')

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(
-- 
cgit v1.2.3