Revert "Sonar fix NullPointerException"

This reverts commit b0f96a46e2720c75eb035bbe94015e5a1c6b0b32.

Issue-ID: SDC-2542
Change-Id: I63b5349670c8e5fa814d686cfa93173d0ea6297e
Signed-off-by: Ofir Sonsino <os0695@intl.att.com>

1 files changed, 4 insertions, 2 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 7d9d475943..3a48286280 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,14 +179,16 @@ public class ResourceMetadataDataDefinition extends ComponentMetadataDataDefinit
         } else if (!vendorName.equals(other.vendorName)) {
             return false;
         }
-        if (vendorRelease == null && other.vendorRelease != null) {
+        if (vendorRelease == null) {
+            if (other.vendorRelease != null) {
                 return false;
+            }
         }
         if (toscaResourceName == null) {
             if (other.toscaResourceName != null) {
                 return false;
             }
-        } else if (vendorRelease!=null && !vendorRelease.equals(other.vendorRelease)) {
+        } else if (!vendorRelease.equals(other.vendorRelease)) {
             return false;
         }
         if (resourceVendorModelNumber == null) {