From: olegb <olegb@amdocs.com>
Date: Tue, 13 Mar 2018 12:35:36 +0000 (+0200)
Subject: Empty error message during Proceed To Validation
X-Git-Tag: v1.2.0~257
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F65%2F35465%2F2;p=sdc.git

Empty error message during Proceed To Validation

Issue-ID: SDC-1120
Change-Id: I6653d6404e8d43ec81016f3497051ac327375c88
Signed-off-by: olegb <olegb@amdocs.com>
---

diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/HeatValidator.java b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/HeatValidator.java
index 0c4371439b..d35a4842d3 100644
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/HeatValidator.java
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/main/java/org/openecomp/sdc/validation/impl/validators/HeatValidator.java
@@ -332,7 +332,12 @@ public class HeatValidator implements Validator {
   private static String getResourceTypeFromResourcesMap(String resourceName,
                                                         HeatOrchestrationTemplate
                                                             heatOrchestrationTemplate) {
-    return heatOrchestrationTemplate.getResources().get(resourceName).getType();
+      Resource resource = heatOrchestrationTemplate.getResources().get(resourceName);
+      if (Objects.nonNull(resource)) {
+          return resource.getType();
+      } else {
+          return null;
+      }
   }
 
   /* validation 17 + */