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

fix NPE when listvolume if vm got destroyed

Browse Source
This commit is contained in:
Edison Su 2011-08-12 14:40:38 -07:00
parent 407b45ee2e
commit 4df7423f70
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -824,12 +824,14 @@ public class ApiResponseHelper implements ResponseGenerator {
Long instanceId = volume.getInstanceId(); Long instanceId = volume.getInstanceId();
if (instanceId != null && volume.getState() != Volume.State.Destroy) { if (instanceId != null && volume.getState() != Volume.State.Destroy) {
VMInstanceVO vm = ApiDBUtils.findVMInstanceById(instanceId); VMInstanceVO vm = ApiDBUtils.findVMInstanceById(instanceId);
volResponse.setVirtualMachineId(vm.getId()); if (vm != null) {
volResponse.setVirtualMachineName(vm.getHostName()); volResponse.setVirtualMachineId(vm.getId());
UserVm userVm = ApiDBUtils.findUserVmById(vm.getId()); volResponse.setVirtualMachineName(vm.getHostName());
if (userVm != null) { UserVm userVm = ApiDBUtils.findUserVmById(vm.getId());
volResponse.setVirtualMachineDisplayName(userVm.getDisplayName()); if (userVm != null) {
volResponse.setVirtualMachineState(vm.getState().toString()); volResponse.setVirtualMachineDisplayName(userVm.getDisplayName());
volResponse.setVirtualMachineState(vm.getState().toString());
}
} }
} }