Merge commands implmentation (fix #1271)

1 files changed, 3 insertions, 3 deletions

diff --git a/src/org/traccar/protocol/UlbotechProtocolDecoder.java b/src/org/traccar/protocol/UlbotechProtocolDecoder.java
index 3ec50b3fc..e6ccfe2c5 100644
--- a/src/org/traccar/protocol/UlbotechProtocolDecoder.java
+++ b/src/org/traccar/protocol/UlbotechProtocolDecoder.java
@@ -28,7 +28,7 @@ import java.util.Date;
 
 public class UlbotechProtocolDecoder extends BaseProtocolDecoder {
 
-    public UlbotechProtocolDecoder(String protocol) {
+    public UlbotechProtocolDecoder(UlbotechProtocol protocol) {
         super(protocol);
     }
 
@@ -57,11 +57,11 @@ public class UlbotechProtocolDecoder extends BaseProtocolDecoder {
 
         // Create new position
         Position position = new Position();
-        position.setProtocol(getProtocol());
+        position.setProtocol(getProtocolName());
 
         // Get device id
         String imei = ChannelBufferTools.readHexString(buf, 16).substring(1);
-        if (!identify(imei)) {
+        if (!identify(imei, channel)) {
             return null;
         }
         position.setDeviceId(getDeviceId());