diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2015-06-29 10:49:13 +1200 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2015-06-29 10:49:13 +1200 |
| commit | 55448d82b2971bc16c67bfa2b2e996d81c4c702e (patch) | |
| tree | 565ee245ea0e98b88674b775147fbc6d3e1933cb /src/org/traccar/protocol/ProgressProtocolDecoder.java | |
| parent | 88b3f00f3855aa408c7859051efdcb5b37fe559f (diff) | |
| parent | d1c4cd526845aad56c5b0a3e20454638bbc7fecc (diff) | |
| download | trackermap-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/ProgressProtocolDecoder.java')
| -rw-r--r-- | src/org/traccar/protocol/ProgressProtocolDecoder.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/org/traccar/protocol/ProgressProtocolDecoder.java b/src/org/traccar/protocol/ProgressProtocolDecoder.java index 9ec0e08eb..4c3e58ddc 100644 --- a/src/org/traccar/protocol/ProgressProtocolDecoder.java +++ b/src/org/traccar/protocol/ProgressProtocolDecoder.java @@ -36,7 +36,7 @@ public class ProgressProtocolDecoder extends BaseProtocolDecoder { private long lastIndex; private long newIndex; - public ProgressProtocolDecoder(String protocol) { + public ProgressProtocolDecoder(ProgressProtocol protocol) { super(protocol); } @@ -81,7 +81,7 @@ public class ProgressProtocolDecoder extends BaseProtocolDecoder { buf.skipBytes(length); length = buf.readUnsignedShort(); String imei = buf.readBytes(length).toString(Charset.defaultCharset()); - identify(imei); + identify(imei, channel); } // Position @@ -95,7 +95,7 @@ public class ProgressProtocolDecoder extends BaseProtocolDecoder { for (int j = 0; j < recordCount; j++) { Position position = new Position(); - position.setProtocol(getProtocol()); + position.setProtocol(getProtocolName()); position.setDeviceId(getDeviceId()); // Message index |