diff options
| author | Ivan Muratov <binakot@gmail.com> | 2017-10-24 14:52:48 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-24 14:52:48 +0300 |
| commit | db02157dbb29539dda4b51a5e8b317293cfc536c (patch) | |
| tree | b974f082172406e16a92cb9da8136ef856f571a5 /src/org/traccar/BaseProtocolEncoder.java | |
| parent | 09d3cf2b5416327700ad22b652cf4a0dca09aaf2 (diff) | |
| parent | 96e15853b9c28bd31295ca2c014e226e4a50aaa1 (diff) | |
| download | trackermap-server-db02157dbb29539dda4b51a5e8b317293cfc536c.tar.gz trackermap-server-db02157dbb29539dda4b51a5e8b317293cfc536c.tar.bz2 trackermap-server-db02157dbb29539dda4b51a5e8b317293cfc536c.zip | |
Merge branch 'master' into master
Diffstat (limited to 'src/org/traccar/BaseProtocolEncoder.java')
| -rw-r--r-- | src/org/traccar/BaseProtocolEncoder.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/org/traccar/BaseProtocolEncoder.java b/src/org/traccar/BaseProtocolEncoder.java index 3c2d08471..2c8a81868 100644 --- a/src/org/traccar/BaseProtocolEncoder.java +++ b/src/org/traccar/BaseProtocolEncoder.java @@ -25,12 +25,12 @@ import org.traccar.model.Device; public abstract class BaseProtocolEncoder extends OneToOneEncoder { protected String getUniqueId(long deviceId) { - return Context.getIdentityManager().getDeviceById(deviceId).getUniqueId(); + return Context.getIdentityManager().getById(deviceId).getUniqueId(); } protected void initDevicePassword(Command command, String defaultPassword) { if (!command.getAttributes().containsKey(Command.KEY_DEVICE_PASSWORD)) { - Device device = Context.getIdentityManager().getDeviceById(command.getDeviceId()); + Device device = Context.getIdentityManager().getById(command.getDeviceId()); String password = device.getString(Command.KEY_DEVICE_PASSWORD); if (password != null) { command.set(Command.KEY_DEVICE_PASSWORD, password); |