From d1c4cd526845aad56c5b0a3e20454638bbc7fecc Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Mon, 29 Jun 2015 10:48:34 +1200
Subject: Merge commands implmentation (fix #1271)

---
 src/org/traccar/protocol/GpsGateProtocolDecoder.java | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'src/org/traccar/protocol/GpsGateProtocolDecoder.java')

diff --git a/src/org/traccar/protocol/GpsGateProtocolDecoder.java b/src/org/traccar/protocol/GpsGateProtocolDecoder.java
index dbc1ac5a9..011ec1219 100644
--- a/src/org/traccar/protocol/GpsGateProtocolDecoder.java
+++ b/src/org/traccar/protocol/GpsGateProtocolDecoder.java
@@ -25,12 +25,11 @@ import org.jboss.netty.channel.ChannelHandlerContext;
 
 import org.traccar.BaseProtocolDecoder;
 import org.traccar.helper.Crc;
-import org.traccar.model.Event;
 import org.traccar.model.Position;
 
 public class GpsGateProtocolDecoder extends BaseProtocolDecoder {
 
-    public GpsGateProtocolDecoder(String protocol) {
+    public GpsGateProtocolDecoder(GpsGateProtocol protocol) {
         super(protocol);
     }
 
@@ -68,7 +67,7 @@ public class GpsGateProtocolDecoder extends BaseProtocolDecoder {
                 int endIndex = sentence.indexOf(',', beginIndex);
                 if (endIndex != -1) {
                     String imei = sentence.substring(beginIndex, endIndex);
-                    if (identify(imei)) {
+                    if (identify(imei, channel)) {
                         if (channel != null) {
                             send(channel, "$FRSES," + channel.getId());
                         }
@@ -99,7 +98,7 @@ public class GpsGateProtocolDecoder extends BaseProtocolDecoder {
 
             // Create new position
             Position position = new Position();
-            position.setProtocol(getProtocol());
+            position.setProtocol(getProtocolName());
             position.setDeviceId(getDeviceId());
 
             Integer index = 1;
-- 
cgit v1.2.3