Merge branch implement commands (fix #1271)

1 files changed, 3 insertions, 3 deletions

diff --git a/src/org/traccar/protocol/TeltonikaProtocolDecoder.java b/src/org/traccar/protocol/TeltonikaProtocolDecoder.java
index 792a64b79..37168ce22 100644
--- a/src/org/traccar/protocol/TeltonikaProtocolDecoder.java
+++ b/src/org/traccar/protocol/TeltonikaProtocolDecoder.java
@@ -31,7 +31,7 @@ import org.traccar.model.Position;
 
 public class TeltonikaProtocolDecoder extends BaseProtocolDecoder {
     
-    public TeltonikaProtocolDecoder(String protocol) {
+    public TeltonikaProtocolDecoder(TeltonikaProtocol protocol) {
         super(protocol);
     }
 
@@ -39,7 +39,7 @@ public class TeltonikaProtocolDecoder extends BaseProtocolDecoder {
 
         int length = buf.readUnsignedShort();
         String imei = buf.toString(buf.readerIndex(), length, Charset.defaultCharset());
-        boolean result =  identify(imei);
+        boolean result =  identify(imei, channel);
 
         if (channel != null) {
             ChannelBuffer response = ChannelBuffers.directBuffer(1);
@@ -68,7 +68,7 @@ public class TeltonikaProtocolDecoder extends BaseProtocolDecoder {
         
         for (int i = 0; i < count; i++) {
             Position position = new Position();
-            position.setProtocol(getProtocol());
+            position.setProtocol(getProtocolName());
             
             position.setDeviceId(getDeviceId());