From d1c4cd526845aad56c5b0a3e20454638bbc7fecc Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Mon, 29 Jun 2015 10:48:34 +1200
Subject: Merge commands implmentation (fix #1271)

---
 src/org/traccar/protocol/Tlt2hProtocolDecoder.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/src/org/traccar/protocol/Tlt2hProtocolDecoder.java b/src/org/traccar/protocol/Tlt2hProtocolDecoder.java
index ecc61d740..fed224937 100644
--- a/src/org/traccar/protocol/Tlt2hProtocolDecoder.java
+++ b/src/org/traccar/protocol/Tlt2hProtocolDecoder.java
@@ -31,7 +31,7 @@ import org.traccar.model.Position;
 
 public class Tlt2hProtocolDecoder extends BaseProtocolDecoder {
 
-    public Tlt2hProtocolDecoder(String protocol) {
+    public Tlt2hProtocolDecoder(Tlt2hProtocol protocol) {
         super(protocol);
     }
 
@@ -72,7 +72,7 @@ public class Tlt2hProtocolDecoder extends BaseProtocolDecoder {
         }
 
         // Get device identifier
-        if (!identify(parser.group(1))) {
+        if (!identify(parser.group(1), channel)) {
             return null;
         }
 
@@ -86,7 +86,7 @@ public class Tlt2hProtocolDecoder extends BaseProtocolDecoder {
             parser = patternPosition.matcher(message);
             if (parser.matches()) {
                 Position position = new Position();
-                position.setProtocol(getProtocol());
+                position.setProtocol(getProtocolName());
                 position.setDeviceId(getDeviceId());
 
                 Integer index = 1;
-- 
cgit v1.2.3