From cda9d2a5fa771830fa493bd3885178a4e4987c8c Mon Sep 17 00:00:00 2001 From: Rodrigo Lima Date: Wed, 22 Apr 2020 11:57:18 -0400 Subject: Handle null condition in TopologyTemplateOperation - check if instanceId null in method isNotEmptyMapOfProperties Issue-ID: SDC-2920 Signed-off-by: Rodrigo Lima Change-Id: I70667142ed51834de638903ccae4ffcb896cccab --- .../be/model/jsonjanusgraph/operations/TopologyTemplateOperation.java | 1 + 1 file changed, 1 insertion(+) (limited to 'catalog-model') 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 mapPropertiesDataDefinition) { return MapUtils.isNotEmpty(mapPropertiesDataDefinition) && + instanceId != null && mapPropertiesDataDefinition.get(instanceId) != null && MapUtils.isNotEmpty(mapPropertiesDataDefinition.get(instanceId).getMapToscaDataDefinition()); } -- cgit 1.2.3-korg