mirror of
				https://github.com/apache/cloudstack.git
				synced 2025-11-04 00:02:37 +01:00 
			
		
		
		
	fix NPE when listvolume if vm got destroyed
This commit is contained in:
		
							parent
							
								
									7ac3c818a9
								
							
						
					
					
						commit
						2548269238
					
				@ -822,12 +822,14 @@ 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());
 | 
			
		||||
                }
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user