etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PublicNetworkGuru: fixed NPE in ipUnassign

This commit is contained in:
alena 2011-02-01 16:07:00 -08:00
parent 27f2b6cbb1
commit d5bded3d6d
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/guru/PublicNetworkGuru.java
View File

@ -154,7 +154,9 @@ public class PublicNetworkGuru extends AdapterBase implements NetworkGuru {
@Override
public void deallocate(Network network, NicProfile nic, VirtualMachineProfile<? extends VirtualMachine> vm) {
IPAddressVO ip = _ipAddressDao.findByAccountAndIp(vm.getVirtualMachine().getAccountId(), nic.getIp4Address());
_ipAddressDao.unassignIpAddress(ip.getId());
if (ip != null) {
_ipAddressDao.unassignIpAddress(ip.getId());
}
nic.deallocate();
}