Allon Mureinik has uploaded a new change for review. Change subject: core: AddDiskCommand.canDoAction() early return ......................................................................
core: AddDiskCommand.canDoAction() early return Made AddDiskCommand.canDoAction() slightly more readable using the early-return idiom. Relates-To: https://bugzilla.redhat.com/854964 Change-Id: Ib89b5008972e6cf895941d211cda5d7f8f14b5e1 Signed-off-by: Allon Mureinik <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java 1 file changed, 19 insertions(+), 10 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/95/12895/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java index 3b127ea..12a9072 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java @@ -32,6 +32,7 @@ import org.ovirt.engine.core.common.businessentities.LUNs; import org.ovirt.engine.core.common.businessentities.LunDisk; import org.ovirt.engine.core.common.businessentities.Snapshot.SnapshotType; +import org.ovirt.engine.core.common.businessentities.StorageDomain; import org.ovirt.engine.core.common.businessentities.StoragePoolIsoMapId; import org.ovirt.engine.core.common.businessentities.StorageServerConnections; import org.ovirt.engine.core.common.businessentities.StorageType; @@ -40,7 +41,6 @@ import org.ovirt.engine.core.common.businessentities.VmDeviceId; import org.ovirt.engine.core.common.businessentities.VolumeType; import org.ovirt.engine.core.common.businessentities.permissions; -import org.ovirt.engine.core.common.businessentities.StorageDomain; import org.ovirt.engine.core.common.businessentities.storage_pool; import org.ovirt.engine.core.common.config.Config; import org.ovirt.engine.core.common.config.ConfigValues; @@ -82,24 +82,33 @@ @Override protected boolean canDoAction() { - boolean returnValue = isVmExist() && acquireLockInternal(); + if (!isVmExist()) { + return false; + } + + if (!acquireLockInternal()) { + return false; + } + VM vm = getVm(); - if (returnValue && vm != null) { + if (vm != null) { // if user sent drive check that its not in use - returnValue = isDiskCanBeAddedToVm(getParameters().getDiskInfo()) && - isDiskPassPciAndIdeLimit(getParameters().getDiskInfo()); + if (!isDiskCanBeAddedToVm(getParameters().getDiskInfo()) || + !isDiskPassPciAndIdeLimit(getParameters().getDiskInfo())) { + return false; + } } - if (returnValue && DiskStorageType.IMAGE == getParameters().getDiskInfo().getDiskStorageType()) { - returnValue = checkIfImageDiskCanBeAdded(vm); + if (DiskStorageType.IMAGE == getParameters().getDiskInfo().getDiskStorageType()) { + return checkIfImageDiskCanBeAdded(vm); } - if (returnValue && DiskStorageType.LUN == getParameters().getDiskInfo().getDiskStorageType()) { - returnValue = checkIfLunDiskCanBeAdded(); + if (DiskStorageType.LUN == getParameters().getDiskInfo().getDiskStorageType()) { + return checkIfLunDiskCanBeAdded(); } - return returnValue; + return true; } protected boolean checkIfLunDiskCanBeAdded() { -- To view, visit http://gerrit.ovirt.org/12895 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib89b5008972e6cf895941d211cda5d7f8f14b5e1 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
