Sergey Gotliv has uploaded a new change for review. Change subject: engine: Initialize array 'imageParameters' in VdcActionParametersBase ......................................................................
engine: Initialize array 'imageParameters' in VdcActionParametersBase Currently this non initialized array causes NullPointerException when trying to create VM from Template without disks. Change-Id: I0fdaf131ed3d1bbfadcdd60df3feb6b828c05d0c Bug-Url: https://bugzilla.redhat.com/1000789 Signed-off-by: Sergey Gotliv <sgot...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmAndCloneImageCommand.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionParametersBase.java 2 files changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/75/18475/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmAndCloneImageCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmAndCloneImageCommand.java index 1b707f1..bb9b5f8 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmAndCloneImageCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmAndCloneImageCommand.java @@ -81,12 +81,10 @@ private void removeVmImages() { // Remove vm images, in case they were not already removed by child commands List<VdcActionParametersBase> imageParams = getParameters().getImagesParameters(); - if (imageParams != null) { - for (VdcActionParametersBase param : imageParams) { - DiskImage diskImage = getDiskImageToRemoveByParam((MoveOrCopyImageGroupParameters) param); - if (diskImage != null) { - ImagesHandler.removeDiskImage(diskImage, getVmId()); - } + for (VdcActionParametersBase param : imageParams) { + DiskImage diskImage = getDiskImageToRemoveByParam((MoveOrCopyImageGroupParameters) param); + if (diskImage != null) { + ImagesHandler.removeDiskImage(diskImage, getVmId()); } } } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionParametersBase.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionParametersBase.java index 7dbf597..dfeb8fe 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionParametersBase.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionParametersBase.java @@ -1,5 +1,6 @@ package org.ovirt.engine.core.common.action; +import java.util.ArrayList; import java.util.List; import javax.validation.constraints.Pattern; @@ -70,6 +71,7 @@ compensationEnabled = false; parentCommand = VdcActionType.Unknown; commandType = VdcActionType.Unknown; + imagesParameters = new ArrayList<VdcActionParametersBase>(); } public Guid getCommandId() { -- To view, visit http://gerrit.ovirt.org/18475 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0fdaf131ed3d1bbfadcdd60df3feb6b828c05d0c Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Sergey Gotliv <sgot...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
