From: Dan Timoney <dtimoney@att.com>
Date: Tue, 17 Nov 2020 13:37:28 +0000 (-0500)
Subject: Fix NPE in toJsonString()
X-Git-Tag: 1.0.4~9^2~1
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=652e1bb38db85b2646229a43935a47f42032a839;p=ccsdk%2Fsli.git

Fix NPE in toJsonString()

Fixed SvcLogicContext.toJsonString() to return the empty string ()
if it cannot find the requested prefix in the service logic context.

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

diff --git a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicContext.java b/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicContext.java
index 129c08526..98cf7e05e 100644
--- a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicContext.java
+++ b/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicContext.java
@@ -298,7 +298,11 @@ public class SvcLogicContext {
         String jsonString = this.toJsonString();
         JsonObject jsonRoot = (JsonObject) jp.parse(jsonString);
         JsonObject targetJson = jsonRoot.getAsJsonObject(pfx);
-        return(targetJson.toString());
+        if (targetJson == null) {
+            return("");
+        } else {
+            return(targetJson.toString());
+        }
     }
 
     public String toJsonString() {