diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2015-07-17 22:51:09 +1200 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2015-07-17 22:51:09 +1200 |
| commit | 466e704934894ed44458bec798fa9fad0532bb4c (patch) | |
| tree | eaf48175234c9d4d1b0456a542887a90c1377d00 /src/org/traccar/BaseProtocolDecoder.java | |
| parent | 6bfaa4bdedcf6719de75afa905a309296aa1bd9d (diff) | |
| parent | ff640cf8eb19cfeb3c8475ffd9b0aeccbd769f96 (diff) | |
| download | trackermap-server-466e704934894ed44458bec798fa9fad0532bb4c.tar.gz trackermap-server-466e704934894ed44458bec798fa9fad0532bb4c.tar.bz2 trackermap-server-466e704934894ed44458bec798fa9fad0532bb4c.zip | |
Merge commands implementation (fix #7)
Diffstat (limited to 'src/org/traccar/BaseProtocolDecoder.java')
| -rw-r--r-- | src/org/traccar/BaseProtocolDecoder.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/org/traccar/BaseProtocolDecoder.java b/src/org/traccar/BaseProtocolDecoder.java index 61f11367c..3509ec4cf 100644 --- a/src/org/traccar/BaseProtocolDecoder.java +++ b/src/org/traccar/BaseProtocolDecoder.java @@ -20,9 +20,6 @@ import org.jboss.netty.channel.Channel; import org.traccar.helper.Log; import org.traccar.model.Device; -/** - * Base class for protocol decoders - */ public abstract class BaseProtocolDecoder extends ExtendedObjectDecoder { private final Protocol protocol; @@ -46,7 +43,7 @@ public abstract class BaseProtocolDecoder extends ExtendedObjectDecoder { Device device = Context.getIdentityManager().getDeviceByUniqueId(uniqueId); if (device != null) { deviceId = device.getId(); - Context.getConnectionManager().setActiveDevice(device.getUniqueId(), protocol, channel, remoteAddress); + Context.getConnectionManager().setActiveDevice(deviceId, protocol, channel, remoteAddress); return true; } else { deviceId = 0; |