Merge commands implmentation (fix #1271)

1 files changed, 3 insertions, 3 deletions

diff --git a/src/org/traccar/protocol/GalileoProtocolDecoder.java b/src/org/traccar/protocol/GalileoProtocolDecoder.java
index c2c8864e9..acf95a552 100644
--- a/src/org/traccar/protocol/GalileoProtocolDecoder.java
+++ b/src/org/traccar/protocol/GalileoProtocolDecoder.java
@@ -31,7 +31,7 @@ import org.traccar.model.Position;
 
 public class GalileoProtocolDecoder extends BaseProtocolDecoder {
 
-    public GalileoProtocolDecoder(String protocol) {
+    public GalileoProtocolDecoder(GalileoProtocol protocol) {
         super(protocol);
     }
 
@@ -91,7 +91,7 @@ public class GalileoProtocolDecoder extends BaseProtocolDecoder {
         Set<Integer> tags = new HashSet<Integer>();
         boolean hasLocation = false;
         Position position = new Position();
-        position.setProtocol(getProtocol());
+        position.setProtocol(getProtocolName());
         
         while (buf.readerIndex() < length) {
 
@@ -112,7 +112,7 @@ public class GalileoProtocolDecoder extends BaseProtocolDecoder {
                 case TAG_IMEI:
                     String imei = buf.toString(buf.readerIndex(), 15, Charset.defaultCharset());
                     buf.skipBytes(imei.length());
-                    identify(imei);
+                    identify(imei, channel);
                     break;
 
                 case TAG_DATE: