apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Check for null vnet when allocation fails

Browse Source
This commit is contained in:
kishan 2010-08-18 13:54:53 +05:30
parent b3cf83c94e
commit ef41ebc9ec
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/com/cloud/network/NetworkManagerImpl.java Executable file → Normal file
View File

@ -880,7 +880,9 @@ public class NetworkManagerImpl implements NetworkManager, VirtualMachineManager
vnet = _dcDao.allocateVnet(router.getDataCenterId(), router.getAccountId()); vnet = _dcDao.allocateVnet(router.getDataCenterId(), router.getAccountId());
} }
vnetAllocated = true; vnetAllocated = true;
routerMacAddress = getRouterMacForVnet(dc, vnet); if(vnet != null){
routerMacAddress = getRouterMacForVnet(dc, vnet);
}
} else if (router.getRole() == Role.DHCP_USERDATA) { } else if (router.getRole() == Role.DHCP_USERDATA) {
if (!Vlan.UNTAGGED.equals(router.getVlanId())) { if (!Vlan.UNTAGGED.equals(router.getVlanId())) {
vnet = router.getVlanId().trim(); vnet = router.getVlanId().trim();