aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/org/onap
diff options
context:
space:
mode:
authorSébastien Determe <sd378r@intl.att.com>2017-11-10 10:04:21 +0000
committerGerrit Code Review <gerrit@onap.org>2017-11-10 10:04:21 +0000
commitf2650c8b133ff9569994eed1c6edc88af981d84c (patch)
tree0a455a96118f9a289c652109f989b6ed4aa47c5e /src/main/java/org/onap
parent06a84f0bc392a6a2845f7512d45af17d86f1d83b (diff)
parente0a5c40af5c32450a52347de83dc3d78c692c1ef (diff)
Merge "Fix Properties CL UI issue"
Diffstat (limited to 'src/main/java/org/onap')
-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());