diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2016-11-24 16:49:54 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-24 16:49:54 +1300 |
| commit | ebe64e810bd8e57a805a571cfd6110fbc3cd57c1 (patch) | |
| tree | 90d8bb347c6081116df225d5c1e08f9469458675 /src/org/traccar/BaseProtocolEncoder.java | |
| parent | 04f33e6ba29b3a73a65b081d2a8b6ac3e0e0ebee (diff) | |
| parent | 03fb12d4a9453d6845198a167a70e720726df2e2 (diff) | |
| download | trackermap-server-ebe64e810bd8e57a805a571cfd6110fbc3cd57c1.tar.gz trackermap-server-ebe64e810bd8e57a805a571cfd6110fbc3cd57c1.tar.bz2 trackermap-server-ebe64e810bd8e57a805a571cfd6110fbc3cd57c1.zip | |
Merge pull request #2593 from Abyss777/attributes_helpers
Attributes helpers
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 5c2c503e4..3c2d08471 100644 --- a/src/org/traccar/BaseProtocolEncoder.java +++ b/src/org/traccar/BaseProtocolEncoder.java @@ -31,8 +31,8 @@ public abstract class BaseProtocolEncoder extends OneToOneEncoder { protected void initDevicePassword(Command command, String defaultPassword) { if (!command.getAttributes().containsKey(Command.KEY_DEVICE_PASSWORD)) { Device device = Context.getIdentityManager().getDeviceById(command.getDeviceId()); - if (device.getAttributes().containsKey(Command.KEY_DEVICE_PASSWORD)) { - String password = (String) device.getAttributes().get(Command.KEY_DEVICE_PASSWORD); + String password = device.getString(Command.KEY_DEVICE_PASSWORD); + if (password != null) { command.set(Command.KEY_DEVICE_PASSWORD, password); } else { command.set(Command.KEY_DEVICE_PASSWORD, defaultPassword); |