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

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 97c73a9e99..afc227faf0 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);