X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=rapp-manager-models%2Fsrc%2Fmain%2Fjava%2Fcom%2Foransc%2Frappmanager%2Fmodels%2Fcache%2FRappCacheService.java;h=cdc42c696bf652eed43a56667ba0c968c2fa60c4;hb=fbc481ba674204cd9972c5c53563110fd0a1a1be;hp=16c231c032a6cfe11e71e3eababccf5e99f8852f;hpb=af33af5536780e1b8f80f1a2e32fb9f970509314;p=nonrtric%2Fplt%2Frappmanager.git

diff --git a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/cache/RappCacheService.java b/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/cache/RappCacheService.java
index 16c231c..cdc42c6 100755
--- a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/cache/RappCacheService.java
+++ b/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/cache/RappCacheService.java
@@ -20,6 +20,7 @@ package com.oransc.rappmanager.models.cache;
 
 import com.oransc.rappmanager.models.rapp.Rapp;
 import java.util.Collection;
+import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import lombok.RequiredArgsConstructor;
@@ -36,8 +37,11 @@ public class RappCacheService {
 
     public Collection<Rapp> getAllRapp() {
         Cache cache = cacheManager.getCache(RAPP_CACHE);
-        Map<String, Rapp> nativeCache = (Map<String, Rapp>) cache.getNativeCache();
-        return nativeCache.values();
+        if(cache != null) {
+            Map<String, Rapp> nativeCache = (Map<String, Rapp>) cache.getNativeCache();
+            return nativeCache.values();
+        }
+        return List.of();
     }
 
     public Optional<Rapp> getRapp(String rappId) {