Liron Aravot has uploaded a new change for review. Change subject: core: NPE while adding lun disks (#869596) ......................................................................
core: NPE while adding lun disks (#869596) fixing regression that was introduced in patch with change id I8cb77b017282733d72ff66af499b576674674e01 while adding a disk there an attempt to check the storage domain of the disk in order to verify whether the added disk storage needs to be wiped after it's deletion, lun disks don't have storage domain and can't be wiped which caused to NPE. Change-Id: Id754bdd7b49ff0dcc80b060f5900f8e3ea313637 Bug-Url: https://bugzilla.redhat.com/869596 Signed-off-by: Liron Aravot <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/21/8821/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 c58e93a..2b2ca9e 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 @@ -300,10 +300,6 @@ @Override protected void executeVmCommand() { ImagesHandler.setDiskAlias(getParameters().getDiskInfo(), getVm()); - if(!getParameters().getDiskInfo().isWipeAfterDeleteSet()) { - StorageType storageType = getStorageDomain().getstorage_type(); - getParameters().getDiskInfo().setWipeAfterDelete(WipeAfterDeleteUtils.getDefaultWipeAfterDeleteFlag(storageType)); - } if (DiskStorageType.IMAGE == getParameters().getDiskInfo().getDiskStorageType()) { createDiskBasedOnImage(); } else { @@ -335,6 +331,10 @@ } private void createDiskBasedOnImage() { + if(!getParameters().getDiskInfo().isWipeAfterDeleteSet()) { + StorageType storageType = getStorageDomain().getstorage_type(); + getParameters().getDiskInfo().setWipeAfterDelete(WipeAfterDeleteUtils.getDefaultWipeAfterDeleteFlag(storageType)); + } // create from blank template, create new vm snapshot id AddImageFromScratchParameters parameters = new AddImageFromScratchParameters(Guid.Empty, -- To view, visit http://gerrit.ovirt.org/8821 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id754bdd7b49ff0dcc80b060f5900f8e3ea313637 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
