Merge commands implmentation (fix #1271)

1 files changed, 3 insertions, 3 deletions

diff --git a/src/org/traccar/protocol/CellocatorProtocolDecoder.java b/src/org/traccar/protocol/CellocatorProtocolDecoder.java
index adb01b234..6c3343224 100644
--- a/src/org/traccar/protocol/CellocatorProtocolDecoder.java
+++ b/src/org/traccar/protocol/CellocatorProtocolDecoder.java
@@ -31,7 +31,7 @@ import org.traccar.model.Position;
 
 public class CellocatorProtocolDecoder extends BaseProtocolDecoder {
 
-    public CellocatorProtocolDecoder(String protocol) {
+    public CellocatorProtocolDecoder(CellocatorProtocol protocol) {
         super(protocol);
     }
 
@@ -104,10 +104,10 @@ public class CellocatorProtocolDecoder extends BaseProtocolDecoder {
         // Parse location
         if (type == MSG_CLIENT_STATUS) {
             Position position = new Position();
-            position.setProtocol(getProtocol());
+            position.setProtocol(getProtocolName());
             
             // Device identifier
-            if (!identify(String.valueOf(deviceUniqueId))) {
+            if (!identify(String.valueOf(deviceUniqueId), channel)) {
                 return null;
             }
             position.setDeviceId(getDeviceId());