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

fixed NPE

This commit is contained in:
Anthony Xu 2013-11-13 18:24:32 -08:00
parent ba9b041fe7
commit fcb806a6ab
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -593,11 +593,11 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager,
CapacityVO cpuCap = _capacityDao.findByHostIdType(host.getId(), CapacityVO.CAPACITY_TYPE_CPU);
CapacityVO memCap = _capacityDao.findByHostIdType(host.getId(), CapacityVO.CAPACITY_TYPE_MEMORY);
if ( host.getTotalMemory() != null ) {
memCap.setTotalCapacity(host.getTotalMemory());
}
if (cpuCap != null && memCap != null){
if (cpuCap != null && memCap != null){
if ( host.getTotalMemory() != null ) {
memCap.setTotalCapacity(host.getTotalMemory());
}
long hostTotalCpu = host.getCpus().longValue() * host.getSpeed().longValue();
if (cpuCap.getTotalCapacity() != hostTotalCpu) {