bug 11672: While listing volumes, check for null Vm instance. Log error when Vm instance is null

status 11672: resolved fixed
This commit is contained in:
kishan 2011-10-11 12:03:59 +05:30
parent ceae8cd365
commit 976b5aa48d

View File

@ -843,12 +843,18 @@ public class ApiResponseHelper implements ResponseGenerator {
Long instanceId = volume.getInstanceId();
if (instanceId != null && volume.getState() != Volume.State.Destroy) {
VMInstanceVO vm = ApiDBUtils.findVMInstanceById(instanceId);
volResponse.setVirtualMachineId(vm.getId());
volResponse.setVirtualMachineName(vm.getHostName());
UserVm userVm = ApiDBUtils.findUserVmById(vm.getId());
if (userVm != null) {
volResponse.setVirtualMachineDisplayName(userVm.getDisplayName());
volResponse.setVirtualMachineState(vm.getState().toString());
if(vm != null){
volResponse.setVirtualMachineId(vm.getId());
volResponse.setVirtualMachineName(vm.getHostName());
UserVm userVm = ApiDBUtils.findUserVmById(vm.getId());
if (userVm != null) {
volResponse.setVirtualMachineDisplayName(userVm.getDisplayName());
volResponse.setVirtualMachineState(vm.getState().toString());
} else {
s_logger.error("User Vm with Id: "+instanceId+" does not exist for volume "+volume.getId());
}
} else {
s_logger.error("Vm with Id: "+instanceId+" does not exist for volume "+volume.getId());
}
}