From 00fcd9fb20009566b61a205c1eec28a65ea574db Mon Sep 17 00:00:00 2001 From: santhosh Date: Thu, 8 May 2014 20:21:09 +1000 Subject: [PATCH] Added fix for CLOUDSTACK-6548 Signed-off-by: santhosh Signed-off-by: Daan Hoogland Conflicts: server/src/com/cloud/network/NetworkServiceImpl.java --- server/src/com/cloud/network/NetworkServiceImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/server/src/com/cloud/network/NetworkServiceImpl.java b/server/src/com/cloud/network/NetworkServiceImpl.java index 62625241284..f1e5b2ad05d 100755 --- a/server/src/com/cloud/network/NetworkServiceImpl.java +++ b/server/src/com/cloud/network/NetworkServiceImpl.java @@ -3973,7 +3973,11 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { //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