aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2017-06-13 17:04:19 +1200
committerGitHub <noreply@github.com>2017-06-13 17:04:19 +1200
commit659ade27a4e6dc56ff19dca4479f033472469479 (patch)
treec1c4e8ac1b5f0566a843ebe04535aaa5b51cb60a /src
parent1df59fb0916ec36604a7771a40f887caebd0e228 (diff)
parent3cdcce26fded7c88109ff98f7e947902ca116452 (diff)
downloadtraccar-server-659ade27a4e6dc56ff19dca4479f033472469479.tar.gz
traccar-server-659ade27a4e6dc56ff19dca4479f033472469479.tar.bz2
traccar-server-659ade27a4e6dc56ff19dca4479f033472469479.zip
Merge pull request #3240 from Abyss777/fix_3238
Fix managed devices enumerating
Diffstat (limited to 'src')
-rw-r--r--src/org/traccar/database/DeviceManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/org/traccar/database/DeviceManager.java b/src/org/traccar/database/DeviceManager.java
index 68e2e8262..f2a2dd565 100644
--- a/src/org/traccar/database/DeviceManager.java
+++ b/src/org/traccar/database/DeviceManager.java
@@ -190,7 +190,7 @@ public class DeviceManager implements IdentityManager {
}
public Collection<Device> getManagedDevices(long userId) throws SQLException {
- Collection<Device> devices = new ArrayList<>();
+ Collection<Device> devices = new HashSet<>();
devices.addAll(getDevices(userId));
for (long managedUserId : Context.getPermissionsManager().getUserPermissions(userId)) {
devices.addAll(getDevices(managedUserId));