Allon Mureinik has uploaded a new change for review.
Change subject: core: ImportVm cleanup: canDoAction
......................................................................
core: ImportVm cleanup: canDoAction
A slight cleanup to canDoAction so it uses the early
return pattern, which is (a bit) more readable.
Change-Id: Icbc4f72d5ce9df230b3d1480a055c603f470770e
Signed-off-by: Allon Mureinik <amure...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java
1 file changed, 14 insertions(+), 9 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/23/9623/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java
index 0f74cc7..f327346 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java
@@ -127,23 +127,28 @@
@Override
protected boolean canDoAction() {
- boolean retVal = true;
List<String> canDoActionMessages =
getReturnValue().getCanDoActionMessages();
Map<Guid, storage_domains> domainsMap = new HashMap<Guid,
storage_domains>();
- retVal = canDoAction_beforeCloneVm(canDoActionMessages, domainsMap);
- if (retVal && getParameters().isImportAsNewEntity()) {
+ if (!canDoAction_beforeCloneVm(canDoActionMessages, domainsMap)) {
+ return failCanDoActionWithType();
+ }
+
+ if (getParameters().isImportAsNewEntity()) {
initImportClonedVm();
}
- retVal = retVal && canDoAction_afterCloneVm(canDoActionMessages,
domainsMap);
-
- if (!retVal) {
- addCanDoActionMessage(VdcBllMessages.VAR__ACTION__IMPORT);
- addCanDoActionMessage(VdcBllMessages.VAR__TYPE__VM);
+ if (!canDoAction_afterCloneVm(canDoActionMessages, domainsMap)) {
+ return failCanDoActionWithType();
}
- return retVal;
+ return true;
+ }
+
+ private boolean failCanDoActionWithType() {
+ addCanDoActionMessage(VdcBllMessages.VAR__ACTION__IMPORT);
+ addCanDoActionMessage(VdcBllMessages.VAR__TYPE__VM);
+ return false;
}
--
To view, visit http://gerrit.ovirt.org/9623
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icbc4f72d5ce9df230b3d1480a055c603f470770e
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Allon Mureinik <amure...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
