From: Dan Timoney <dtimoney@att.com>
Date: Wed, 24 Mar 2021 14:33:13 +0000 (-0400)
Subject: Fix null pointer exception
X-Git-Tag: 1.3.0~29
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=60b8216bd4461eee98d1758b34a94cd96d665562;p=ccsdk%2Fsli.git

Fix null pointer exception

Fix null pointer exception in case of empty list

Issue-ID: CCSDK-3237
Signed-off-by: Dan Timoney <dtimoney@att.com>
Change-Id: Ic94d60bf7a52c23507ecc2402f9be9b580f2ea5b
---

diff --git a/core/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelper.java b/core/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelper.java
index 94e1425cb..ce8253a5c 100755
--- a/core/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelper.java
+++ b/core/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelper.java
@@ -299,7 +299,10 @@ public class MdsalHelper {
                             if (!isAccessible) {
                                 m.setAccessible(true);
                             }
-                            Object retList = Map.class.isAssignableFrom(returnType)?new ArrayList(((Map) m.invoke(fromObj)).values()):m.invoke(fromObj);
+                            Object retList = m.invoke(fromObj);
+                            if ((retList != null) && Map.class.isAssignableFrom(returnType)) {
+                                retList = new ArrayList(((Map)retList).values());
+                            }
                             //due duplicated getters with Map and List(deprecated) stop if already mapped
                             if(!hasAlreadyKeys(props,propNamePfx + "." + fieldName)) {