From: Rodrigo Lima <rodrigo.lima@yoppworks.com>
Date: Wed, 22 Apr 2020 15:57:18 +0000 (-0400)
Subject: Handle null condition in TopologyTemplateOperation
X-Git-Tag: 1.7.0~205
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F55%2F106455%2F1;p=sdc.git

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
---

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());
     }