summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Smokowski <ss835w@att.com>2019-07-08 14:19:14 +0000
committerGerrit Code Review <gerrit@onap.org>2019-07-08 14:19:14 +0000
commitf83362f93e7a88c34b85048aaf2e1f14c611800f (patch)
tree1fc954e27224efad99c52d16d5a9a7c4d2060b23
parent79b5b02dc56510838deb94c1f54e4f8b88c130b5 (diff)
parent824c03a9bdd44a76143062b6bb36393f16bffb50 (diff)
Merge "Added null check for heatStack to prevent crash at getCanonicalName() call"
-rw-r--r--adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/MsoNetworkAdapterImpl.java2
1 files changed, 1 insertions, 1 deletions
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();