Merge commands implmentation (fix #1271)

1 files changed, 3 insertions, 3 deletions

diff --git a/src/org/traccar/protocol/NavisProtocolDecoder.java b/src/org/traccar/protocol/NavisProtocolDecoder.java
index 125559aab..94dcec1a4 100644
--- a/src/org/traccar/protocol/NavisProtocolDecoder.java
+++ b/src/org/traccar/protocol/NavisProtocolDecoder.java
@@ -38,7 +38,7 @@ public class NavisProtocolDecoder extends BaseProtocolDecoder {
 
     private static final Charset charset = Charset.defaultCharset();
 
-    public NavisProtocolDecoder(String protocol) {
+    public NavisProtocolDecoder(NavisProtocol protocol) {
         super(protocol);
     }
 
@@ -80,7 +80,7 @@ public class NavisProtocolDecoder extends BaseProtocolDecoder {
 
     private ParseResult parsePosition(ChannelBuffer buf) {
         Position position = new Position();
-        position.setProtocol(getProtocol());
+        position.setProtocol(getProtocolName());
 
         position.setDeviceId(getDeviceId());
 
@@ -252,7 +252,7 @@ public class NavisProtocolDecoder extends BaseProtocolDecoder {
 
     private Object processHandshake(Channel channel, ChannelBuffer buf) {
         buf.readByte(); // semicolon symbol
-        if (identify(buf.toString(Charset.defaultCharset()))) {
+        if (identify(buf.toString(Charset.defaultCharset()), channel)) {
             sendReply(channel, ChannelBuffers.copiedBuffer(ByteOrder.LITTLE_ENDIAN, "*<S", charset));
         }
         return null;