Merge commands implmentation (fix #1271)

1 files changed, 3 insertions, 4 deletions

diff --git a/src/org/traccar/protocol/NoranProtocolDecoder.java b/src/org/traccar/protocol/NoranProtocolDecoder.java
index 69ed623d8..f7eb26e97 100644
--- a/src/org/traccar/protocol/NoranProtocolDecoder.java
+++ b/src/org/traccar/protocol/NoranProtocolDecoder.java
@@ -21,7 +21,6 @@ import java.nio.charset.Charset;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
-import java.util.Date;
 import java.util.TimeZone;
 
 import org.jboss.netty.buffer.ChannelBuffer;
@@ -35,7 +34,7 @@ import org.traccar.model.Position;
 
 public class NoranProtocolDecoder extends BaseProtocolDecoder {
 
-    public NoranProtocolDecoder(String protocol) {
+    public NoranProtocolDecoder(NoranProtocol protocol) {
         super(protocol);
     }
 
@@ -88,7 +87,7 @@ public class NoranProtocolDecoder extends BaseProtocolDecoder {
 
             // Create new position
             Position position = new Position();
-            position.setProtocol(getProtocol());
+            position.setProtocol(getProtocolName());
             
             if (type == MSG_CONTROL_RESPONSE) {
                 buf.readUnsignedInt(); // GIS ip
@@ -129,7 +128,7 @@ public class NoranProtocolDecoder extends BaseProtocolDecoder {
 
             // Identification
             String id = buf.readBytes(newFormat ? 12 : 11).toString(Charset.defaultCharset()).replaceAll("[^\\p{Print}]", "");
-            if (!identify(id)) {
+            if (!identify(id, channel, remoteAddress)) {
                 return null;
             }
             position.setDeviceId(getDeviceId());