From e0a5c40af5c32450a52347de83dc3d78c692c1ef Mon Sep 17 00:00:00 2001 From: xg353y Date: Thu, 9 Nov 2017 16:52:37 +0100 Subject: Fix Properties CL UI issue Fix the issue in Properties CL window, where the first service doesn't show the corresponding vf settings Change-Id: I59f1f5117f453f1cb385d4789288a5b8a690e7e9 Signed-off-by: xg353y Issue-ID: CLAMP-68 --- src/main/java/org/onap/clamp/clds/service/CldsService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java') diff --git a/src/main/java/org/onap/clamp/clds/service/CldsService.java b/src/main/java/org/onap/clamp/clds/service/CldsService.java index 157063456..f9eeeb58b 100644 --- a/src/main/java/org/onap/clamp/clds/service/CldsService.java +++ b/src/main/java/org/onap/clamp/clds/service/CldsService.java @@ -937,7 +937,7 @@ public class CldsService extends SecureServiceBase { JsonNode globalNode = modelJson.get("global"); String service = AbstractModelElement.getValueByName(globalNode, "service"); List resourceVf = AbstractModelElement.getValuesByName(globalNode, "vf"); - if (resourceVf != null && !resourceVf.isEmpty()) { + if (service != null && resourceVf != null && !resourceVf.isEmpty()) { List cldsModelPropList = cldsDao.getAllModelProperties(); for (CldsModelProp cldsModelProp : cldsModelPropList) { JsonNode currentJson = new ObjectMapper().readTree(cldsModelProp.getPropText()); -- cgit 1.2.3-korg