Skip to content

Commit c7c675e

Browse files
committed
fix npe in capacity calculation
Signed-off-by: Abhishek Kumar <[email protected]>
1 parent 8541823 commit c7c675e

File tree

3 files changed

+1
-11
lines changed

3 files changed

+1
-11
lines changed

engine/schema/src/main/java/com/cloud/vm/dao/VMInstanceDao.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,6 @@ List<VMInstanceVO> searchRemovedByRemoveDate(final Date startDate, final Date en
183183

184184
List<VMInstanceVO> listIdServiceOfferingForVmsMigratingFromHost(Long hostId);
185185

186-
List<VMInstanceVO> listIdServiceOfferingForVmsByLastHostId(Long hostId);
187-
188186
Map<String, Long> getNameIdMapForVmInstanceNames(Collection<String> names);
189187

190188
Map<String, Long> getNameIdMapForVmIds(Collection<Long> ids);

engine/schema/src/main/java/com/cloud/vm/dao/VMInstanceDaoImpl.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1198,14 +1198,6 @@ public List<VMInstanceVO> listIdServiceOfferingForVmsMigratingFromHost(Long host
11981198
return customSearch(sc, null);
11991199
}
12001200

1201-
@Override
1202-
public List<VMInstanceVO> listIdServiceOfferingForVmsByLastHostId(Long hostId) {
1203-
SearchCriteria<VMInstanceVO> sc = IdServiceOfferingIdSelectSearch.create();
1204-
sc.setParameters("lastHost", hostId);
1205-
sc.setParameters("state", State.Stopped);
1206-
return customSearch(sc, null);
1207-
}
1208-
12091201
@Override
12101202
public Map<String, Long> getNameIdMapForVmInstanceNames(Collection<String> names) {
12111203
SearchBuilder<VMInstanceVO> sb = createSearchBuilder();

server/src/main/java/com/cloud/capacity/CapacityManagerImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -728,7 +728,7 @@ public void updateCapacityForHost(final Host host) {
728728
}
729729
}
730730

731-
List<VMInstanceVO> vmsByLastHostId = _vmDao.listIdServiceOfferingForVmsByLastHostId(host.getId());
731+
List<VMInstanceVO> vmsByLastHostId = _vmDao.listByLastHostId(host.getId());
732732
logger.debug("Found {} VM, not running on {}", vmsByLastHostId.size(), host);
733733

734734
for (VMInstanceVO vm : vmsByLastHostId) {

0 commit comments

Comments
 (0)