Merge commands implmentation (fix #1271)

1 files changed, 5 insertions, 5 deletions

diff --git a/src/org/traccar/protocol/MegastekProtocolDecoder.java b/src/org/traccar/protocol/MegastekProtocolDecoder.java
index 3f29d8470..5b9f0408c 100644
--- a/src/org/traccar/protocol/MegastekProtocolDecoder.java
+++ b/src/org/traccar/protocol/MegastekProtocolDecoder.java
@@ -29,7 +29,7 @@ import org.traccar.model.Position;
 
 public class MegastekProtocolDecoder extends BaseProtocolDecoder {
 
-    public MegastekProtocolDecoder(String protocol) {
+    public MegastekProtocolDecoder(MegastekProtocol protocol) {
         super(protocol);
     }
 
@@ -171,7 +171,7 @@ public class MegastekProtocolDecoder extends BaseProtocolDecoder {
 
         // Create new position
         Position position = new Position();
-        position.setProtocol(getProtocol());
+        position.setProtocol(getProtocolName());
 
         // Parse location data
         if (!parseGPRMC(gprmc, position)) {
@@ -192,8 +192,8 @@ public class MegastekProtocolDecoder extends BaseProtocolDecoder {
             position.set(Event.KEY_ALARM, parser.group(index++));
 
             // IMEI
-            if (!identify(parser.group(index++), false)) {
-                if (!identify(id)) {
+            if (!identify(parser.group(index++), channel, null, false)) {
+                if (!identify(id, channel)) {
                     return null;
                 }
             }
@@ -231,7 +231,7 @@ public class MegastekProtocolDecoder extends BaseProtocolDecoder {
             
             int index = 1;
 
-            if (!identify(id)) {
+            if (!identify(id, channel)) {
                 return null;
             }
             position.setDeviceId(getDeviceId());