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

CLOUDSTACK-4506: fix NPE in case hostid is null 

Conflicts:

	server/src/com/cloud/capacity/CapacityManagerImpl.java
This commit is contained in:
Edison Su 2014-03-27 15:19:50 -07:00
parent eacc1d7fff
commit 0bbb8437cd
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/com/cloud/capacity/CapacityManagerImpl.java
View File

@ -182,6 +182,10 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager,
@DB
@Override
public boolean releaseVmCapacity(VirtualMachine vm, final boolean moveFromReserved, final boolean moveToReservered, final Long hostId) {
if (hostId == null) {
return true;
}
final ServiceOfferingVO svo = _offeringsDao.findById(vm.getId(), vm.getServiceOfferingId());
CapacityVO capacityCpu = _capacityDao.findByHostIdType(hostId, Capacity.CAPACITY_TYPE_CPU);
CapacityVO capacityMemory = _capacityDao.findByHostIdType(hostId, Capacity.CAPACITY_TYPE_MEMORY);