Merge branch implement commands (fix #1271)

1 files changed, 3 insertions, 3 deletions

diff --git a/src/org/traccar/protocol/OrionProtocolDecoder.java b/src/org/traccar/protocol/OrionProtocolDecoder.java
index 7265a9762..e43ced8a5 100644
--- a/src/org/traccar/protocol/OrionProtocolDecoder.java
+++ b/src/org/traccar/protocol/OrionProtocolDecoder.java
@@ -31,7 +31,7 @@ import org.traccar.model.Position;
 
 public class OrionProtocolDecoder extends BaseProtocolDecoder {
 
-    public OrionProtocolDecoder(String protocol) {
+    public OrionProtocolDecoder(OrionProtocol protocol) {
         super(protocol);
     }
     
@@ -72,7 +72,7 @@ public class OrionProtocolDecoder extends BaseProtocolDecoder {
                 sendResponse(channel, buf);
             }
 
-            if (!identify(String.valueOf(buf.readUnsignedInt()))) {
+            if (!identify(String.valueOf(buf.readUnsignedInt()), channel)) {
                 return null;
             }
 
@@ -83,7 +83,7 @@ public class OrionProtocolDecoder extends BaseProtocolDecoder {
                 // Create new position
                 Position position = new Position();
                 position.setDeviceId(getDeviceId());
-                position.setProtocol(getProtocol());
+                position.setProtocol(getProtocolName());
                 
                 position.set(Event.KEY_EVENT, buf.readUnsignedByte());
                 buf.readUnsignedByte(); // length