From b0f96a46e2720c75eb035bbe94015e5a1c6b0b32 Mon Sep 17 00:00:00 2001 From: Arindam Mondal Date: Tue, 10 Sep 2019 15:02:53 +0900 Subject: Sonar fix NullPointerException Issue-ID: SDC-2542 Change-Id: I08a93932d2776c40a982bb802aeac994c1f35841 Signed-off-by: arindamm --- .../sdc/be/datatypes/components/ResourceMetadataDataDefinition.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'common-be/src/main/java/org/openecomp') diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/components/ResourceMetadataDataDefinition.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/components/ResourceMetadataDataDefinition.java index 3a48286280..7d9d475943 100644 --- a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/components/ResourceMetadataDataDefinition.java +++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/components/ResourceMetadataDataDefinition.java @@ -179,16 +179,14 @@ public class ResourceMetadataDataDefinition extends ComponentMetadataDataDefinit } else if (!vendorName.equals(other.vendorName)) { return false; } - if (vendorRelease == null) { - if (other.vendorRelease != null) { + if (vendorRelease == null && other.vendorRelease != null) { return false; - } } if (toscaResourceName == null) { if (other.toscaResourceName != null) { return false; } - } else if (!vendorRelease.equals(other.vendorRelease)) { + } else if (vendorRelease!=null && !vendorRelease.equals(other.vendorRelease)) { return false; } if (resourceVendorModelNumber == null) { -- cgit 1.2.3-korg