CLOUDSTACK-8578: fix listVirtualMachines does not return deleted machines when zone is specified

resmo · DaanHoogland · commit 82ecc1aa06e7 · 2015-06-23T14:53:08.000+02:00
Signed-off-by: Daan Hoogland <daan.hoogland@gmail.com> This closes apache#510
diff --git a/server/src/com/cloud/api/query/QueryManagerImpl.java b/server/src/com/cloud/api/query/QueryManagerImpl.java
@@ -982,10 +982,6 @@ private Pair<List<UserVmJoinVO>, Integer> searchForUserVMsInternal(ListVMsCmd cm
 
         if (zoneId != null) {
             sc.setParameters("dataCenterId", zoneId);
-
-            if (state == null) {
-                sc.setParameters("stateNEQ", "Destroyed");
-            }
         }
 
         if (affinityGroupId != null) {

Original file line number	Diff line number	Diff line change
`@@ -982,10 +982,6 @@ private Pair<List<UserVmJoinVO>, Integer> searchForUserVMsInternal(ListVMsCmd cm`
`982`	`982`
`983`	`983`	`if (zoneId != null) {`
`984`	`984`	`sc.setParameters("dataCenterId", zoneId);`
`985`		`-`
`986`		`- if (state == null) {`
`987`		`- sc.setParameters("stateNEQ", "Destroyed");`
`988`		`- }`
`989`	`985`	`}`
`990`	`986`
`991`	`987`	`if (affinityGroupId != null) {`