From 59bbaa37656d1aacd7df21d70ec5bfa85cf98608 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton@traccar.org>
Date: Mon, 6 Jun 2022 19:05:20 -0700
Subject: Handle missing cache (fix #4861)

---
 src/main/java/org/traccar/session/cache/CacheManager.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/main/java')

diff --git a/src/main/java/org/traccar/session/cache/CacheManager.java b/src/main/java/org/traccar/session/cache/CacheManager.java
index aca3df52d..102a31ecd 100644
--- a/src/main/java/org/traccar/session/cache/CacheManager.java
+++ b/src/main/java/org/traccar/session/cache/CacheManager.java
@@ -69,7 +69,8 @@ public class CacheManager {
     public <T extends BaseModel> T getObject(Class<T> clazz, long id) {
         try {
             lock.readLock().lock();
-            return deviceCache.get(new CacheKey(clazz, id)).getValue();
+            var cacheValue = deviceCache.get(new CacheKey(clazz, id));
+            return cacheValue != null ? cacheValue.getValue() : null;
         } finally {
             lock.readLock().unlock();
         }
-- 
cgit v1.2.3