fix NPE when listvolume if vm got destroyed

This commit is contained in:
Edison Su 2011-08-12 14:40:38 -07:00
parent 407b45ee2e
commit 4df7423f70

View File

@ -824,6 +824,7 @@ public class ApiResponseHelper implements ResponseGenerator {
Long instanceId = volume.getInstanceId();
if (instanceId != null && volume.getState() != Volume.State.Destroy) {
VMInstanceVO vm = ApiDBUtils.findVMInstanceById(instanceId);
if (vm != null) {
volResponse.setVirtualMachineId(vm.getId());
volResponse.setVirtualMachineName(vm.getHostName());
UserVm userVm = ApiDBUtils.findUserVmById(vm.getId());
@ -832,6 +833,7 @@ public class ApiResponseHelper implements ResponseGenerator {
volResponse.setVirtualMachineState(vm.getState().toString());
}
}
}
// Show the virtual size of the volume
volResponse.setSize(volume.getSize());