From: Oleksandr Moliavko <o.moliavko@samsung.com>
Date: Mon, 19 Aug 2019 07:54:42 +0000 (+0300)
Subject: Added null check for heat to remove static
X-Git-Tag: 1.5.2~63
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=5b17afb416e3ab2d3f58694d275e67f20af5a1c6;p=so.git

Added null check for heat to remove static
analyzer warning

Issue-ID: SO-1841
Signed-off-by: Oleksandr Moliavko <o.moliavko@samsung.com>
Change-Id: I71eb14adcc1227af4470853e6e1acdb631a7efe8
---

diff --git a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/vnf/MsoVnfAdapterImpl.java b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/vnf/MsoVnfAdapterImpl.java
index 1d73bf21c9..af2fa24ff9 100644
--- a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/vnf/MsoVnfAdapterImpl.java
+++ b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/vnf/MsoVnfAdapterImpl.java
@@ -640,7 +640,11 @@ public class MsoVnfAdapterImpl implements MsoVnfAdapter {
 
         StackInfo heatStack = null;
         try {
-            heatStack = heat.queryStack(cloudSiteId, cloudOwner, tenantId, vfModuleName);
+            if (heat != null) {
+                heatStack = heat.queryStack(cloudSiteId, cloudOwner, tenantId, vfModuleName);
+            } else {
+                throw new MsoHeatNotFoundException();
+            }
         } catch (MsoException me) {
             String error = "Create VF Module: Query " + vfModuleName + " in " + cloudOwner + "/" + cloudSiteId + "/"
                     + tenantId + ": " + me;