X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=common-be%2Fsrc%2Fmain%2Fjava%2Forg%2Fopenecomp%2Fsdc%2Fbe%2Fdatatypes%2Felements%2FComponentInstanceDataDefinition.java;h=384796b965b4d3e917e7fd1c75d931dd8328ba56;hb=f8694841d586cfb44c69a602d76bf19d1491e65a;hp=57270f6eaac2329bdb3936371e20e35bd36f0a92;hpb=9597e97eddcc9b5ea3376fb8d49b02fe42f5d820;p=sdc.git

diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/ComponentInstanceDataDefinition.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/ComponentInstanceDataDefinition.java
index 57270f6eaa..384796b965 100644
--- a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/ComponentInstanceDataDefinition.java
+++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/ComponentInstanceDataDefinition.java
@@ -137,7 +137,7 @@ public class ComponentInstanceDataDefinition extends ToscaDataDefinition impleme
 	}
 
 	public void setName(String name) {
-		if (this.getInvariantName() == null) {
+		if (this.getInvariantName() == null && name != null) {
 			this.setInvariantName(ValidationUtils.normalizeComponentInstanceName(name));
 		}
 		setToscaPresentationValue(JsonPresentationFields.NAME, name);