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

Bug 14490: Fix NPE in ListCapacity

This commit is contained in:
Nitin Mehta 2012-03-24 16:24:51 +05:30
parent 2cfcee47d0
commit 277c0c8bca
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/com/cloud/capacity/Capacity.java
View File

@ -37,7 +37,7 @@ public interface Capacity {
public Long getHostOrPoolId();
public long getDataCenterId();
public Long getDataCenterId();
public Long getPodId();

10
core/src/com/cloud/capacity/CapacityVO.java
View File

@ -44,7 +44,7 @@ public class CapacityVO implements Capacity {
private Long hostOrPoolId;
@Column(name="data_center_id")
private long dataCenterId;
private Long dataCenterId;
@Column(name="pod_id")
private Long podId;
@ -79,7 +79,7 @@ public class CapacityVO implements Capacity {
public CapacityVO() {}
public CapacityVO(Long hostId, long dataCenterId, Long podId, Long clusterId, long usedCapacity, long totalCapacity, short capacityType) {
public CapacityVO(Long hostId, Long dataCenterId, Long podId, Long clusterId, long usedCapacity, long totalCapacity, short capacityType) {
this.hostOrPoolId = hostId;
this.dataCenterId = dataCenterId;
this.podId = podId;
@ -90,7 +90,7 @@ public class CapacityVO implements Capacity {
this.updateTime = new Date();
}
public CapacityVO(long dataCenterId, Long podId, Long clusterId, short capacityType, float usedPercentage) {
public CapacityVO(Long dataCenterId, Long podId, Long clusterId, short capacityType, float usedPercentage) {
this.dataCenterId = dataCenterId;
this.podId = podId;
this.clusterId = clusterId;
@ -112,10 +112,10 @@ public class CapacityVO implements Capacity {
this.hostOrPoolId = hostId;
}
@Override
public long getDataCenterId() {
public Long getDataCenterId() {
return dataCenterId;
}
public void setDataCenterId(long dataCenterId) {
public void setDataCenterId(Long dataCenterId) {
this.dataCenterId = dataCenterId;
}

5
server/src/com/cloud/server/ManagementServerImpl.java
View File

@ -2089,6 +2089,11 @@ public class ManagementServerImpl implements ManagementServer {
} else if (zoneId != null) {
dcList.add(ApiDBUtils.findZoneById(zoneId));
} else {
if (clusterId != null){
zoneId = ApiDBUtils.findClusterById(clusterId).getDataCenterId();
}else{
zoneId = ApiDBUtils.findPodById(podId).getDataCenterId();
}
if (capacityType == null || capacityType == Capacity.CAPACITY_TYPE_STORAGE) {
capacities.add(_storageMgr.getStoragePoolUsedStats(null, clusterId, podId, zoneId));
}