diff --git a/server/src/com/cloud/api/commands/ListVMsCmd.java b/server/src/com/cloud/api/commands/ListVMsCmd.java index 7bb83d85b35..e90b066819b 100644 --- a/server/src/com/cloud/api/commands/ListVMsCmd.java +++ b/server/src/com/cloud/api/commands/ListVMsCmd.java @@ -165,6 +165,14 @@ public class ListVMsCmd extends BaseCmd { } for (UserVm vmInstance : virtualMachines) { + + //if the account is deleted, do not return the user vm + Account currentVmAccount = getManagementServer().getAccount(vmInstance.getAccountId()); + if(currentVmAccount.getRemoved()!=null) + { + continue; //not returning this vm + } + List> vmData = new ArrayList>(); AsyncJobVO asyncJob = getManagementServer().findInstancePendingAsyncJob("vm_instance", vmInstance.getId()); if(asyncJob != null) {