Arik Hadas has uploaded a new change for review.
Change subject: core: cleanup SearchQuery#searchVmsFromDb
......................................................................
core: cleanup SearchQuery#searchVmsFromDb
Change-Id: I473e1ac0abe497d10fb16a7a3581c10f5084ae8f
Signed-off-by: Arik Hadas <aha...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SearchQuery.java
1 file changed, 7 insertions(+), 10 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/45/38245/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SearchQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SearchQuery.java
index e680d7e..3e68c84 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SearchQuery.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SearchQuery.java
@@ -146,19 +146,16 @@
}
private List<VM> searchVmsFromDb() {
- List<VM> returnValue = null;
-
QueryData data = initQueryData(true);
if (data == null) {
- returnValue = new ArrayList<VM>();
-
getQueryReturnValue().setExceptionString(getQueryReturnValue().getExceptionString());
- } else {
- returnValue =
getDbFacade().getVmDao().getAllUsingQuery(data.getQuery());
- for (VM vm : returnValue) {
- VmHandler.updateVmGuestAgentVersion(vm);
- }
+ return Collections.emptyList();
}
- return returnValue;
+
+ List<VM> vms =
getDbFacade().getVmDao().getAllUsingQuery(data.getQuery());
+ for (VM vm : vms) {
+ VmHandler.updateVmGuestAgentVersion(vm);
+ }
+ return vms;
}
private List<VDS> searchVDSsByDb() {
--
To view, visit https://gerrit.ovirt.org/38245
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I473e1ac0abe497d10fb16a7a3581c10f5084ae8f
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Arik Hadas <aha...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
