From: Oleksandr Moliavko <o.moliavko@samsung.com>
Date: Fri, 9 Aug 2019 10:25:38 +0000 (+0300)
Subject: Moved setNeutronNetworkId() call inside null check
X-Git-Tag: 1.5.2~53^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F83%2F93183%2F1;p=so.git

Moved setNeutronNetworkId() call inside null check
to prevent crash at outputs.get() call

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

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 4c115271f0..cd98cf8d87 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
@@ -462,13 +462,13 @@ public class MsoNetworkAdapterImpl implements MsoNetworkAdapter {
                         }
                     }
                 }
+                networkRollback.setNeutronNetworkId((String) outputs.get(NETWORK_ID));
             }
             subnetIdMap.value = sMap;
 
             rollback.value = networkRollback;
             // Populate remaining rollback info and response parameters.
             networkRollback.setNetworkStackId(heatStack.getCanonicalName());
-            networkRollback.setNeutronNetworkId((String) heatStack.getOutputs().get(NETWORK_ID));
             networkRollback.setNetworkCreated(true);
             networkRollback.setNetworkType(networkType);