summaryrefslogtreecommitdiffstats
path: root/catalog-model
diff options
context:
space:
mode:
authorRodrigo Lima <rodrigo.lima@yoppworks.com>2020-04-22 11:57:18 -0400
committerRodrigo Lima <rodrigo.lima@yoppworks.com>2020-04-22 11:57:18 -0400
commitcda9d2a5fa771830fa493bd3885178a4e4987c8c (patch)
tree3bac8125bb4b1fa11761971a9acd5352586e0c02 /catalog-model
parentef3165222d153feec6168a0544d75951c982dcad (diff)
Handle null condition in TopologyTemplateOperation
- check if instanceId null in method isNotEmptyMapOfProperties Issue-ID: SDC-2920 Signed-off-by: Rodrigo Lima <rodrigo.lima@yoppworks.com> Change-Id: I70667142ed51834de638903ccae4ffcb896cccab
Diffstat (limited to 'catalog-model')
-rw-r--r--catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/TopologyTemplateOperation.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/TopologyTemplateOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/TopologyTemplateOperation.java
index 98450716e2..3f28d72ef4 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/TopologyTemplateOperation.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/TopologyTemplateOperation.java
@@ -1481,6 +1481,7 @@ public class TopologyTemplateOperation extends ToscaElementOperation {
private boolean isNotEmptyMapOfProperties(String instanceId, Map<String, MapCapabilityProperty> mapPropertiesDataDefinition) {
return MapUtils.isNotEmpty(mapPropertiesDataDefinition) &&
+ instanceId != null &&
mapPropertiesDataDefinition.get(instanceId) != null &&
MapUtils.isNotEmpty(mapPropertiesDataDefinition.get(instanceId).getMapToscaDataDefinition());
}