diff options
| author | jcardus <joaquim.cardeira@gmail.com> | 2020-03-25 17:25:19 +0000 |
|---|---|---|
| committer | jcardus <joaquim.cardeira@gmail.com> | 2020-03-25 17:25:19 +0000 |
| commit | feac85bad4004fb3e316a88285626e12840398d2 (patch) | |
| tree | d268a79d63b9d1f27b6e433fedc90de7b427b172 /src/main/java/org/traccar/api/ExtendedObjectResource.java | |
| parent | 7b669e3181f637f06b31b55bd930584c7b08e897 (diff) | |
| parent | f3d465abe7f255ec44e976caade642e4c2fd7598 (diff) | |
| download | trackermap-server-feac85bad4004fb3e316a88285626e12840398d2.tar.gz trackermap-server-feac85bad4004fb3e316a88285626e12840398d2.tar.bz2 trackermap-server-feac85bad4004fb3e316a88285626e12840398d2.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src/main/java/org/traccar/api/ExtendedObjectResource.java')
| -rw-r--r-- | src/main/java/org/traccar/api/ExtendedObjectResource.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/org/traccar/api/ExtendedObjectResource.java b/src/main/java/org/traccar/api/ExtendedObjectResource.java index 007a7b1bd..9e554217e 100644 --- a/src/main/java/org/traccar/api/ExtendedObjectResource.java +++ b/src/main/java/org/traccar/api/ExtendedObjectResource.java @@ -55,8 +55,8 @@ public class ExtendedObjectResource<T extends BaseModel> extends BaseObjectResou Context.getPermissionsManager().checkDevice(getUserId(), deviceId); result.retainAll(manager.getDeviceItems(deviceId)); } - return manager.getItems(result); + return manager.getItems(result); } } |