Liron Aravot has uploaded a new change for review. Change subject: core : remove image - if clause order ......................................................................
core : remove image - if clause order change if clause order to avoid funcionality change, will be revisited in a further patch. Change-Id: I643b2ab944adb21f05328e8081d3b0b3f9e2c2cc Signed-off-by: Liron Aravot <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveImageCommand.java 1 file changed, 8 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/72/11372/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveImageCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveImageCommand.java index 50c3fe0..7d9ae47 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveImageCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveImageCommand.java @@ -268,16 +268,17 @@ } private void endCommand() { - if (!getParameters().isRemoveDuringExecution()) { - if (getParameters().getRemoveFromDB()) { + if (getParameters().getRemoveFromDB()) { + if (!getParameters().isRemoveDuringExecution()) { removeImageFromDB(true); - } else { - getImageStorageDomainMapDao().remove( - new ImageStorageDomainMapId(getParameters().getImageId(), - getParameters().getStorageDomainId())); - unLockImage(); } + } else { + getImageStorageDomainMapDao().remove( + new ImageStorageDomainMapId(getParameters().getImageId(), + getParameters().getStorageDomainId())); + unLockImage(); } + setSucceeded(true); } -- To view, visit http://gerrit.ovirt.org/11372 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I643b2ab944adb21f05328e8081d3b0b3f9e2c2cc Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Liron Aravot <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
