From: Oleksandr Moliavko <o.moliavko@samsung.com>
Date: Tue, 2 Jul 2019 06:59:15 +0000 (+0300)
Subject: Added null check for heatStack to prevent crash at
X-Git-Tag: 1.5.2~226^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=824c03a9bdd44a76143062b6bb36393f16bffb50;p=so.git

Added null check for heatStack to prevent crash at
getCanonicalName() call

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

diff --git a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/MsoNetworkAdapterImpl.java b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/MsoNetworkAdapterImpl.java
index d2c0d9cabd..5dff4705af 100644
--- a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/MsoNetworkAdapterImpl.java
+++ b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/MsoNetworkAdapterImpl.java
@@ -962,7 +962,7 @@ public class MsoNetworkAdapterImpl implements MsoNetworkAdapter {
             if (netInfo != null) {
                 // Found. Populate the output elements
                 networkExists.value = Boolean.TRUE;
-                if ("HEAT".equals(mode)) {
+                if ("HEAT".equals(mode) && heatStack != null) {
                     networkId.value = heatStack.getCanonicalName();
                 } else {
                     networkId.value = netInfo.getId();