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

Revert "fix NPE when listvolume if vm got destroyed"

Browse Source 
This reverts commit b6518399987a17c791f22b991dcea36d57866269.
This commit is contained in:
alena 2011-08-12 17:30:13 -07:00
parent a8424da076
commit 25ddb22724
1 changed files with 6 additions and 8 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

@ -822,14 +822,12 @@ 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);
if (vm != null) { volResponse.setVirtualMachineId(vm.getId());
volResponse.setVirtualMachineId(vm.getId()); volResponse.setVirtualMachineName(vm.getHostName());
volResponse.setVirtualMachineName(vm.getHostName()); UserVm userVm = ApiDBUtils.findUserVmById(vm.getId());
UserVm userVm = ApiDBUtils.findUserVmById(vm.getId()); if (userVm != null) {
if (userVm != null) { volResponse.setVirtualMachineDisplayName(userVm.getDisplayName());
volResponse.setVirtualMachineDisplayName(userVm.getDisplayName()); volResponse.setVirtualMachineState(vm.getState().toString());
volResponse.setVirtualMachineState(vm.getState().toString());
}
} }
} }