Repository: cloudstack Updated Branches: refs/heads/master 5ba5da369 -> 00fcd9fb2
Added fix for CLOUDSTACK-6548 Signed-off-by: santhosh <[email protected]> Signed-off-by: Daan Hoogland <[email protected]> Conflicts: server/src/com/cloud/network/NetworkServiceImpl.java Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/00fcd9fb Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/00fcd9fb Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/00fcd9fb Branch: refs/heads/master Commit: 00fcd9fb20009566b61a205c1eec28a65ea574db Parents: 5ba5da3 Author: santhosh <[email protected]> Authored: Thu May 8 20:21:09 2014 +1000 Committer: Daan Hoogland <[email protected]> Committed: Fri May 9 17:14:06 2014 +0200 ---------------------------------------------------------------------- server/src/com/cloud/network/NetworkServiceImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/00fcd9fb/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 index 6262524..f1e5b2a 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
