Merge commands implmentation (fix #1271)

1 files changed, 4 insertions, 4 deletions

diff --git a/src/org/traccar/protocol/SyrusProtocolDecoder.java b/src/org/traccar/protocol/SyrusProtocolDecoder.java
index b182b8b37..236ded2dc 100644
--- a/src/org/traccar/protocol/SyrusProtocolDecoder.java
+++ b/src/org/traccar/protocol/SyrusProtocolDecoder.java
@@ -25,15 +25,15 @@ import org.jboss.netty.channel.Channel;
 import org.jboss.netty.channel.ChannelHandlerContext;
 
 import org.traccar.BaseProtocolDecoder;
+import org.traccar.Protocol;
 import org.traccar.helper.UnitsConverter;
-import org.traccar.model.Event;
 import org.traccar.model.Position;
 
 public class SyrusProtocolDecoder extends BaseProtocolDecoder {
     
     boolean sendResponse;
 
-    public SyrusProtocolDecoder(String protocol, boolean sendResponse) {
+    public SyrusProtocolDecoder(Protocol protocol, boolean sendResponse) {
         super(protocol);
         this.sendResponse = sendResponse;
     }
@@ -111,7 +111,7 @@ public class SyrusProtocolDecoder extends BaseProtocolDecoder {
 
             // Find device in database
             String id = sentence.substring(beginIndex, endIndex);
-            if (!identify(id)) {
+            if (!identify(id, channel)) {
                 return null;
             }
 
@@ -131,7 +131,7 @@ public class SyrusProtocolDecoder extends BaseProtocolDecoder {
 
         // Create new position
         Position position = new Position();
-        position.setProtocol(getProtocol());
+        position.setProtocol(getProtocolName());
         position.setDeviceId(getDeviceId());
 
         Integer index = 1;