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/TytanProtocolDecoder.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/src/org/traccar/protocol/TytanProtocolDecoder.java b/src/org/traccar/protocol/TytanProtocolDecoder.java
index 3ef0e11b7..5296d23a0 100644
--- a/src/org/traccar/protocol/TytanProtocolDecoder.java
+++ b/src/org/traccar/protocol/TytanProtocolDecoder.java
@@ -31,7 +31,7 @@ import org.traccar.model.Position;
 
 public class TytanProtocolDecoder extends BaseProtocolDecoder {
 
-    public TytanProtocolDecoder(String protocol) {
+    public TytanProtocolDecoder(TytanProtocol protocol) {
         super(protocol);
     }
 
@@ -52,7 +52,7 @@ public class TytanProtocolDecoder extends BaseProtocolDecoder {
         }
         
         String id = String.valueOf(buf.readUnsignedInt());
-        if (!identify(id)) {
+        if (!identify(id, channel, remoteAddress)) {
             return null;
         }
 
@@ -61,7 +61,7 @@ public class TytanProtocolDecoder extends BaseProtocolDecoder {
         while (buf.readable()) {
             
             Position position = new Position();
-            position.setProtocol(getProtocol());
+            position.setProtocol(getProtocolName());
             position.setDeviceId(getDeviceId());
             
             int end = buf.readerIndex() + buf.readUnsignedByte();
-- 
cgit v1.2.3