From Tal Nisan <tnisan@redhat.com>:

Tal Nisan has submitted this change and it was merged. Change subject: core: fix NumberFormatException when importing a removed VM ...................................................................... core: fix NumberFormatException when importing a removed VM When importing a VM while another is in the process of being removed a NumberFormatException will be thrown and the import will fail. This is caused by the removed VMs getting a "_remove_me_" prefix to its GUID when removed. Because of the prefix the method GetImagesListVDSCommand#executeIrsBrokerCommand fails when attempting to create an instance of the Guid object using the prefixed GUID of the removed VM. Fixed by filtering out the prefixed image GUIDs in ImagesListReturn constructor. Change-Id: I564fb9d0c08e6fabbf8ffd05cfdf93d5435a0e0b Bug-Url: https://bugzilla.redhat.com/1331335 Signed-off-by: Benny Zlotnik <bzlotnik@redhat.com> --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/ImagesListReturn.java A backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/irsbroker/ImagesListReturnTest.java 2 files changed, 51 insertions(+), 4 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Benny Zlotnik: Verified Jenkins CI: Passed CI tests Idan Shaby: Looks good to me, but someone else must approve -- To view, visit https://gerrit.ovirt.org/69803 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I564fb9d0c08e6fabbf8ffd05cfdf93d5435a0e0b Gerrit-PatchSet: 8 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Benny Zlotnik <bzlotnik@redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini@redhat.com> Gerrit-Reviewer: Benny Zlotnik <bzlotnik@redhat.com> Gerrit-Reviewer: Idan Shaby <ishaby@redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Liron Aravot <laravot@redhat.com> Gerrit-Reviewer: Maor Lipchuk <mlipchuk@redhat.com> Gerrit-Reviewer: Nir Soffer <nsoffer@redhat.com> Gerrit-Reviewer: Tal Nisan <tnisan@redhat.com> Gerrit-Reviewer: gerrit-hooks <automation@ovirt.org>