Allon Mureinik has uploaded a new change for review. Change subject: core: AddStorageDomainCommand.getTargetStoragePool ......................................................................
core: AddStorageDomainCommand.getTargetStoragePool Extracted AddStorageDomainCommand.getTargetStoragePool for later use (not to mention the increased readability). Change-Id: I3776beb5a7426e010f05ca0b4f3dffb128346ed7 Realted-To: https://bugzilla.redhat.com/1120712 Signed-off-by: Allon Mureinik <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageDomainCommand.java 1 file changed, 11 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/47/31347/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageDomainCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageDomainCommand.java index 1df13a6..4669d92 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageDomainCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageDomainCommand.java @@ -171,13 +171,10 @@ private boolean isStorageFormatSupportedByStoragePool() { StorageFormatType storageFormat = getStorageDomain().getStorageFormat(); - StoragePool targetStoragePool = getStoragePool(); + StoragePool targetStoragePool = getTargetStoragePool(); if (targetStoragePool == null) { - targetStoragePool = getStoragePoolDAO().get(getVds().getStoragePoolId()); - if (targetStoragePool == null) { - return false; - } + return false; } Set<StorageFormatType> supportedStorageFormats = @@ -189,6 +186,15 @@ return true; } + private StoragePool getTargetStoragePool() { + StoragePool targetStoragePool = getStoragePool(); + + if (targetStoragePool == null) { + targetStoragePool = getStoragePoolDAO().get(getVds().getStoragePoolId()); + } + return targetStoragePool; + } + private boolean isStorageFormatCompatibleWithDomain() { StorageFormatType storageFormat = getStorageDomain().getStorageFormat(); StorageType storageType = getStorageDomain().getStorageType(); -- To view, visit http://gerrit.ovirt.org/31347 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3776beb5a7426e010f05ca0b4f3dffb128346ed7 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Allon Mureinik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
