Tal Nisan has submitted this change and it was merged. Change subject: core: Fix NPE during merge of snapshots ...................................................................... core: Fix NPE during merge of snapshots Commit 6e55d137d5ca (core: Move disks boot and interface properties to DiskVmelement) disk boot and interface properties moved to DiskVmElement. This change caused NPE during snapshot merge because the DiskVmElement wasn't set on destination image. This patch sets DiskVmElement on disk before calling OvfWriter. Change-Id: I5ffecab869f82b5b78a5e1f19bdecbb6927e44e1 Signed-off-by: Ala Hino <ahino@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/image/ImagesHandler.java 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Jenkins CI: Passed CI tests Allon Mureinik: Looks good to me, but someone else must approve Ala Hino: Verified -- To view, visit https://gerrit.ovirt.org/58509 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5ffecab869f82b5b78a5e1f19bdecbb6927e44e1 Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Ala Hino <ahino@redhat.com> Gerrit-Reviewer: Ala Hino <ahino@redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini@redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Tal Nisan <tnisan@redhat.com> Gerrit-Reviewer: gerrit-hooks <automation@ovirt.org>