From d1c4cd526845aad56c5b0a3e20454638bbc7fecc Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Mon, 29 Jun 2015 10:48:34 +1200 Subject: Merge commands implmentation (fix #1271) --- src/org/traccar/protocol/Tr900ProtocolDecoder.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/org/traccar/protocol/Tr900ProtocolDecoder.java') diff --git a/src/org/traccar/protocol/Tr900ProtocolDecoder.java b/src/org/traccar/protocol/Tr900ProtocolDecoder.java index fadca5fc6..ff99a8e8a 100644 --- a/src/org/traccar/protocol/Tr900ProtocolDecoder.java +++ b/src/org/traccar/protocol/Tr900ProtocolDecoder.java @@ -28,7 +28,7 @@ import org.traccar.model.Position; public class Tr900ProtocolDecoder extends BaseProtocolDecoder { - public Tr900ProtocolDecoder(String protocol) { + public Tr900ProtocolDecoder(Tr900Protocol protocol) { super(protocol); } @@ -69,11 +69,11 @@ public class Tr900ProtocolDecoder extends BaseProtocolDecoder { // Create new position Position position = new Position(); - position.setProtocol(getProtocol()); + position.setProtocol(getProtocolName()); Integer index = 1; // Identification - if (!identify(parser.group(index++))) { + if (!identify(parser.group(index++), channel, remoteAddress)) { return null; } position.setDeviceId(getDeviceId()); -- cgit v1.2.3