aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2016-11-23 17:49:36 +0500
committerAbyss777 <abyss@fox5.ru>2016-11-23 17:49:36 +0500
commitef0b4ac118c3c430c3046d35229aa48cdb65e25d (patch)
tree45b462cf6147d287fb386bb39df7231f4ed1e6a1
parent03dc6436216c90fc6f6914afb5807659a71201de (diff)
downloadtraccar-server-ef0b4ac118c3c430c3046d35229aa48cdb65e25d.tar.gz
traccar-server-ef0b4ac118c3c430c3046d35229aa48cdb65e25d.tar.bz2
traccar-server-ef0b4ac118c3c430c3046d35229aa48cdb65e25d.zip
Some more places
-rw-r--r--src/org/traccar/database/DeviceManager.java6
-rw-r--r--src/org/traccar/notification/PropertiesProvider.java2
2 files changed, 3 insertions, 5 deletions
diff --git a/src/org/traccar/database/DeviceManager.java b/src/org/traccar/database/DeviceManager.java
index e0b7fd2db..600669579 100644
--- a/src/org/traccar/database/DeviceManager.java
+++ b/src/org/traccar/database/DeviceManager.java
@@ -401,9 +401,7 @@ public class DeviceManager implements IdentityManager {
String result = null;
Device device = getDeviceById(deviceId);
if (device != null) {
- if (device.getAttributes().containsKey(attributeName)) {
- result = (String) device.getAttributes().get(attributeName);
- }
+ result = device.getString(attributeName);
if (result == null && lookupGroupsAttribute) {
long groupId = device.getGroupId();
while (groupId != 0) {
@@ -421,7 +419,7 @@ public class DeviceManager implements IdentityManager {
if (result == null) {
if (lookupServer) {
Server server = Context.getPermissionsManager().getServer();
- result = (String) server.getAttributes().get(attributeName);
+ result = server.getString(attributeName);
} else {
result = Context.getConfig().getString(attributeName);
}
diff --git a/src/org/traccar/notification/PropertiesProvider.java b/src/org/traccar/notification/PropertiesProvider.java
index 9136288f8..e7cac8d0f 100644
--- a/src/org/traccar/notification/PropertiesProvider.java
+++ b/src/org/traccar/notification/PropertiesProvider.java
@@ -36,7 +36,7 @@ public class PropertiesProvider {
if (config != null) {
return config.getString(key);
} else {
- return (String) extensible.getAttributes().get(key);
+ return extensible.getString(key);
}
}