aboutsummaryrefslogtreecommitdiffstats
path: root/common-be
diff options
context:
space:
mode:
Diffstat (limited to 'common-be')
-rw-r--r--common-be/src/main/java/org/openecomp/sdc/be/datatypes/components/ResourceMetadataDataDefinition.java6
1 files changed, 2 insertions, 4 deletions
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) {