apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug 7368: should get volumeVO even if it is removed

Browse Source 
status 7368: resolved fixed
This commit is contained in:
anthony 2010-12-01 16:09:28 -08:00
parent 5584177dbb
commit 17f3239f07
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/com/cloud/api/ApiDBUtils.java
View File

@ -420,7 +420,7 @@ public class ApiDBUtils {
} }
public static VolumeVO findVolumeById(Long volumeId) { public static VolumeVO findVolumeById(Long volumeId) {
return _volumeDao.findById(volumeId); return _volumeDao.findByIdIncludingRemoved(volumeId);
} }
public static DataCenterVO findZoneById(Long zoneId) { public static DataCenterVO findZoneById(Long zoneId) {

16
server/src/com/cloud/api/ApiResponseHelper.java
View File

@ -378,12 +378,14 @@ public class ApiResponseHelper implements ResponseGenerator {
snapshotResponse.setDomainName(ApiDBUtils.findDomainById(acct.getDomainId()).getName()); snapshotResponse.setDomainName(ApiDBUtils.findDomainById(acct.getDomainId()).getName());
} }
VolumeVO volume = ApiDBUtils.findVolumeById(snapshot.getVolumeId()); VolumeVO volume = findVolumeById(snapshot.getVolumeId());
String snapshotTypeStr = Type.values()[snapshot.getSnapshotType()].name(); String snapshotTypeStr = Type.values()[snapshot.getSnapshotType()].name();
snapshotResponse.setSnapshotType(snapshotTypeStr); snapshotResponse.setSnapshotType(snapshotTypeStr);
snapshotResponse.setVolumeId(snapshot.getVolumeId()); snapshotResponse.setVolumeId(snapshot.getVolumeId());
snapshotResponse.setVolumeName(volume.getName()); if( volume != null ) {
snapshotResponse.setVolumeType(volume.getVolumeType().name()); snapshotResponse.setVolumeName(volume.getName());
snapshotResponse.setVolumeType(volume.getVolumeType().name());
}
snapshotResponse.setCreated(snapshot.getCreated()); snapshotResponse.setCreated(snapshot.getCreated());
snapshotResponse.setName(snapshot.getName()); snapshotResponse.setName(snapshot.getName());
snapshotResponse.setIntervalType(ApiDBUtils.getSnapshotIntervalTypes(snapshot.getId())); snapshotResponse.setIntervalType(ApiDBUtils.getSnapshotIntervalTypes(snapshot.getId()));
@ -1396,7 +1398,7 @@ public class ApiResponseHelper implements ResponseGenerator {
} }
@Override @Override
public Volume findVolumeById(Long volumeId) { public VolumeVO findVolumeById(Long volumeId) {
return ApiDBUtils.findVolumeById(volumeId); return ApiDBUtils.findVolumeById(volumeId);
} }
@ -1925,12 +1927,12 @@ public class ApiResponseHelper implements ResponseGenerator {
response.setPasswordEnabled(template.getEnablePassword()); response.setPasswordEnabled(template.getEnablePassword());
response.setCrossZones(template.isCrossZones()); response.setCrossZones(template.isCrossZones());
Volume volume = null; VolumeVO volume = null;
if (snapshotId != null) { if (snapshotId != null) {
Snapshot snapshot = ApiDBUtils.findSnapshotById(snapshotId); Snapshot snapshot = ApiDBUtils.findSnapshotById(snapshotId);
volume = ApiDBUtils.findVolumeById(snapshot.getVolumeId()); volume = findVolumeById(snapshot.getVolumeId());
} else { } else {
volume = ApiDBUtils.findVolumeById(volumeId); volume = findVolumeById(volumeId);
} }
VMTemplateHostVO templateHostRef = ApiDBUtils.findTemplateHostRef(template.getId(), volume.getDataCenterId()); VMTemplateHostVO templateHostRef = ApiDBUtils.findTemplateHostRef(template.getId(), volume.getDataCenterId());