1 files changed, 11 insertions, 9 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-api/src/main/java/org/openecomp/sdc/generator/datatypes/tosca/VendorInfo.java b/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-api/src/main/java/org/openecomp/sdc/generator/datatypes/tosca/VendorInfo.java
index 22348f3083..0c2be2508c 100644
--- a/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-api/src/main/java/org/openecomp/sdc/generator/datatypes/tosca/VendorInfo.java
+++ b/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-api/src/main/java/org/openecomp/sdc/generator/datatypes/tosca/VendorInfo.java
@@ -32,19 +32,21 @@ public class VendorInfo {
   public boolean equals(Object obj) {
     if (this == obj)
       return true;
-    if (getClass() != obj.getClass())
+    if (obj != null && getClass() != obj.getClass())
       return false;
     VendorInfo other = (VendorInfo) obj;
-    if (this.manufacturer_reference_number == null) {
-      if (other.manufacturer_reference_number != null)
+    if (other != null) {
+      if (this.manufacturer_reference_number == null) {
+        if (other.manufacturer_reference_number != null)
+          return false;
+      } else if (!manufacturer_reference_number.equals(other.manufacturer_reference_number))
         return false;
-    } else if (!manufacturer_reference_number.equals(other.manufacturer_reference_number))
-      return false;
-    if (this.vendor_model == null) {
-      if (other.vendor_model != null)
+      if (this.vendor_model == null) {
+        if (other.vendor_model != null)
+          return false;
+      } else if (!vendor_model.equals(other.vendor_model))
         return false;
-    } else if (!vendor_model.equals(other.vendor_model))
-      return false;
+    }
     return true;
   }