Maor Lipchuk has uploaded a new change for review. Change subject: core: Use shorter scope for try catch block ......................................................................
core: Use shorter scope for try catch block There is no need to put try catch block on createTask since it is already swallows the exception in CommandBase. Change-Id: Icbdfa7acaac633a1e2010db5fd9fc9afe4fab219 Related to Bug-Url: https://bugzilla.redhat.com/1037441 Signed-off-by: Maor Lipchuk <mlipc...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateCloneOfTemplateCommand.java 1 file changed, 13 insertions(+), 12 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/12/23912/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateCloneOfTemplateCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateCloneOfTemplateCommand.java index 6891416..e35db7b 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateCloneOfTemplateCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateCloneOfTemplateCommand.java @@ -51,9 +51,8 @@ .getStoragePoolId() : Guid.Empty; VDSReturnValue vdsReturnValue = null; + Guid taskId = persistAsyncTaskPlaceHolder(VdcActionType.AddVmFromTemplate); try { - Guid taskId = persistAsyncTaskPlaceHolder(VdcActionType.AddVmFromTemplate); - vdsReturnValue = runVdsCommand(VDSCommandType.CopyImage, new CopyImageVDSCommandParameters(storagePoolID, getDiskImage().getStorageIds().get(0), getVmTemplateId(), getDiskImage().getId(), getImage().getImageId(), @@ -62,19 +61,21 @@ mNewCreatedDiskImage.getVolumeFormat(), mNewCreatedDiskImage.getVolumeType(), getDiskImage().isWipeAfterDelete(), false)); - if (vdsReturnValue.getSucceeded()) { - getReturnValue().getInternalVdsmTaskIdList().add( - createTask(taskId, - vdsReturnValue.getCreationInfo(), - VdcActionType.AddVmFromTemplate, - VdcObjectType.Storage, - getParameters().getStorageDomainId(), - getDestinationStorageDomainId())); - } - } catch (Exception e) { + } catch (VdcBLLException e) { log.errorFormat("Failed creating snapshot from image id -'{0}'", getImage().getImageId()); throw new VdcBLLException(VdcBllErrors.VolumeCreationError); } + + if (vdsReturnValue.getSucceeded()) { + getReturnValue().getInternalVdsmTaskIdList().add( + createTask(taskId, + vdsReturnValue.getCreationInfo(), + VdcActionType.AddVmFromTemplate, + VdcObjectType.Storage, + getParameters().getStorageDomainId(), + getDestinationStorageDomainId())); + } + return vdsReturnValue; } -- To view, visit http://gerrit.ovirt.org/23912 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icbdfa7acaac633a1e2010db5fd9fc9afe4fab219 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.4 Gerrit-Owner: Maor Lipchuk <mlipc...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
