Merge "Moved null check for outputs so that get() method call won't result in crash."

1 files changed, 4 insertions, 4 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 be4cc5a05d..97c73a9e99 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
@@ -915,7 +915,7 @@ public class MsoNetworkAdapterImpl implements MsoNetworkAdapter {
         // Use MsoNeutronUtils for all NEUTRON commands
 
         String mode;
-        String neutronId;
+        String neutronId = null;
         // Try Heat first, since networks may be named the same as the Heat stack
         StackInfo heatStack = null;
         long queryStackStarttime = System.currentTimeMillis();
@@ -931,12 +931,12 @@ public class MsoNetworkAdapterImpl implements MsoNetworkAdapter {
         // Populate the outputs based on the returned Stack information
         if (heatStack != null && heatStack.getStatus() != HeatStatus.NOTFOUND) {
             // Found it. Get the neutronNetworkId for further query
+            Map<String, String> sMap = new HashMap<>();
             Map<String, Object> outputs = heatStack.getOutputs();
-            neutronId = (String) outputs.get(NETWORK_ID);
             mode = "HEAT";
-
-            Map<String, String> sMap = new HashMap<>();
             if (outputs != null) {
+                neutronId = (String) outputs.get(NETWORK_ID);
+
                 for (String key : outputs.keySet()) {
                     if (key != null && key.startsWith("subnet_id_")) // multiples subnet_%aaid% outputs
                     {