aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/protocol/SyrusProtocolDecoder.java
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2015-06-29 10:49:13 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2015-06-29 10:49:13 +1200
commit55448d82b2971bc16c67bfa2b2e996d81c4c702e (patch)
tree565ee245ea0e98b88674b775147fbc6d3e1933cb /src/org/traccar/protocol/SyrusProtocolDecoder.java
parent88b3f00f3855aa408c7859051efdcb5b37fe559f (diff)
parentd1c4cd526845aad56c5b0a3e20454638bbc7fecc (diff)
downloadtrackermap-server-55448d82b2971bc16c67bfa2b2e996d81c4c702e.tar.gz
trackermap-server-55448d82b2971bc16c67bfa2b2e996d81c4c702e.tar.bz2
trackermap-server-55448d82b2971bc16c67bfa2b2e996d81c4c702e.zip
Merge branch implement commands (fix #1271)
Diffstat (limited to 'src/org/traccar/protocol/SyrusProtocolDecoder.java')
-rw-r--r--src/org/traccar/protocol/SyrusProtocolDecoder.java8
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;