diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2020-09-30 23:08:57 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-30 23:08:57 -0700 |
| commit | ed298cecfaa852f43828c5f62e98fa9063bc1be0 (patch) | |
| tree | 05dae02283339e64ace42ff062281a68a4f14df8 /src/main/java/org/traccar/api/resource | |
| parent | 1e06b00e5f6068a191d0652798f12df77f0b0e0a (diff) | |
| parent | ef5f959f737a6277b146e5eb4e34827638b1f93c (diff) | |
| download | traccar-server-ed298cecfaa852f43828c5f62e98fa9063bc1be0.tar.gz traccar-server-ed298cecfaa852f43828c5f62e98fa9063bc1be0.tar.bz2 traccar-server-ed298cecfaa852f43828c5f62e98fa9063bc1be0.zip | |
Merge pull request #4578 from traccar/code-cleanup
Various minor code cleanup
Diffstat (limited to 'src/main/java/org/traccar/api/resource')
| -rw-r--r-- | src/main/java/org/traccar/api/resource/DeviceResource.java | 2 | ||||
| -rw-r--r-- | src/main/java/org/traccar/api/resource/UserResource.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/org/traccar/api/resource/DeviceResource.java b/src/main/java/org/traccar/api/resource/DeviceResource.java index f9c9a139d..7006cdb84 100644 --- a/src/main/java/org/traccar/api/resource/DeviceResource.java +++ b/src/main/java/org/traccar/api/resource/DeviceResource.java @@ -52,7 +52,7 @@ public class DeviceResource extends BaseObjectResource<Device> { @QueryParam("uniqueId") List<String> uniqueIds, @QueryParam("id") List<Long> deviceIds) throws SQLException { DeviceManager deviceManager = Context.getDeviceManager(); - Set<Long> result = null; + Set<Long> result; if (all) { if (Context.getPermissionsManager().getUserAdmin(getUserId())) { result = deviceManager.getAllItems(); diff --git a/src/main/java/org/traccar/api/resource/UserResource.java b/src/main/java/org/traccar/api/resource/UserResource.java index 0b42d8d92..813ace6d6 100644 --- a/src/main/java/org/traccar/api/resource/UserResource.java +++ b/src/main/java/org/traccar/api/resource/UserResource.java @@ -48,7 +48,7 @@ public class UserResource extends BaseObjectResource<User> { @GET public Collection<User> get(@QueryParam("userId") long userId) throws SQLException { UsersManager usersManager = Context.getUsersManager(); - Set<Long> result = null; + Set<Long> result; if (Context.getPermissionsManager().getUserAdmin(getUserId())) { if (userId != 0) { result = usersManager.getUserItems(userId); |