Added fix for CLOUDSTACK-6548

sedukull · DaanHoogland · commit 00fcd9fb2000 · 2014-05-09T17:14:06.000+02:00
Signed-off-by: santhosh &lt;santhosh.edukulla@gmail.com&gt;
Signed-off-by: Daan Hoogland &lt;daan@onecht.net&gt;

Conflicts:
	server/src/com/cloud/network/NetworkServiceImpl.java
diff --git a/server/src/com/cloud/network/NetworkServiceImpl.java b/server/src/com/cloud/network/NetworkServiceImpl.java
@@ -3973,7 +3973,11 @@ public Network doInTransaction(TransactionStatus status) throws ResourceAllocati
                         //create Guest network
                         privateNetwork = _networkMgr.createGuestNetwork(ntwkOffFinal.getId(), networkName, displayText, gateway, cidr, uriString, null, owner, null, pNtwk,
                                 pNtwk.getDataCenterId(), ACLType.Account, null, vpcId, null, null, true, null);
-                        s_logger.debug("Created private network " + privateNetwork);
+                        if (privateNetwork != null) {
+                            s_logger.debug("Successfully created guest network " + privateNetwork);
+                        } else {
+                            throw new CloudRuntimeException("Creating guest network failed");
+                        }
                     } else {
                         s_logger.debug("Private network already exists: " + privateNetwork);
                         //Do not allow multiple private gateways with same Vlan within a VPC
