summaryrefslogtreecommitdiffstats
path: root/src/main/java/org
diff options
context:
space:
mode:
authorxg353y <xg353y@intl.att.com>2017-11-09 16:52:37 +0100
committerxg353y <xg353y@intl.att.com>2017-11-09 16:52:37 +0100
commite0a5c40af5c32450a52347de83dc3d78c692c1ef (patch)
treeb710255a9b70653acaabbebe88bec1199bb1b88c /src/main/java/org
parentf391c6ca9ee635c25f57f217e3280cb25e42ac9f (diff)
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 <xg353y@intl.att.com> Issue-ID: CLAMP-68
Diffstat (limited to 'src/main/java/org')
-rw-r--r--src/main/java/org/onap/clamp/clds/service/CldsService.java2
1 files changed, 1 insertions, 1 deletions
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<String> resourceVf = AbstractModelElement.getValuesByName(globalNode, "vf");
- if (resourceVf != null && !resourceVf.isEmpty()) {
+ if (service != null && resourceVf != null && !resourceVf.isEmpty()) {
List<CldsModelProp> cldsModelPropList = cldsDao.getAllModelProperties();
for (CldsModelProp cldsModelProp : cldsModelPropList) {
JsonNode currentJson = new ObjectMapper().readTree(cldsModelProp.getPropText());