Allon Mureinik has uploaded a new change for review.
Change subject: core: Early return RemoveDiskCommand.canDoAction()
......................................................................
core: Early return RemoveDiskCommand.canDoAction()
Converted RemoveDiskCommand.canDoAction() to use the early return
pattern for increased readability.
Change-Id: I32eb51e9e3cee5920f90b8f1ff8a8148a10cf2f1
Signed-off-by: Allon Mureinik <amure...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskCommand.java
1 file changed, 6 insertions(+), 12 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/12/11012/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskCommand.java
index 2137932..78e4253 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskCommand.java
@@ -73,23 +73,17 @@
@Override
protected boolean canDoAction() {
- boolean retValue = true;
-
if (disk == null) {
- retValue = false;
-
addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_VM_IMAGE_DOES_NOT_EXIST);
+ return
failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_VM_IMAGE_DOES_NOT_EXIST);
}
- if (retValue) {
- buildSharedLockMap();
- retValue = acquireLockInternal();
+ buildSharedLockMap();
+ if (!acquireLockInternal()) {
+ return false;
}
- retValue =
- retValue
- && (disk.getDiskStorageType() == DiskStorageType.IMAGE
? canRemoveDiskBasedOnImageStorageCheck()
- : canRemoveLunDisk());
- return retValue;
+ return (disk.getDiskStorageType() == DiskStorageType.IMAGE ?
+ canRemoveDiskBasedOnImageStorageCheck() : canRemoveLunDisk());
}
private boolean canRemoveLunDisk() {
--
To view, visit http://gerrit.ovirt.org/11012
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I32eb51e9e3cee5920f90b8f1ff8a8148a10cf2f1
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
