Merge pull request #4519 from kgrosvenor/fix/object-manager-null-items

Ensure item is not null before adding to the collection  in getItems

1 files changed, 4 insertions, 1 deletions

diff --git a/src/main/java/org/traccar/database/BaseObjectManager.java b/src/main/java/org/traccar/database/BaseObjectManager.java
index e274e5aba..d0024c005 100644
--- a/src/main/java/org/traccar/database/BaseObjectManager.java
+++ b/src/main/java/org/traccar/database/BaseObjectManager.java
@@ -158,7 +158,10 @@ public class BaseObjectManager<T extends BaseModel> {
     public final Collection<T> getItems(Set<Long> itemIds) {
         Collection<T> result = new LinkedList<>();
         for (long itemId : itemIds) {
-            result.add(getById(itemId));
+            T item = getById(itemId);
+            if (item != null) {
+                result.add(item);
+            }
         }
         return result;
     }