Tal Nisan has submitted this change and it was merged. Change subject: core: Avoid NPE when changing image status (868887) ...................................................................... core: Avoid NPE when changing image status (868887) Sometimes BaseImagesCommand.setImageStatus() checked for getRelevantDiskImage() without checking for null. Higher up in the hierarchy the getDiskImage returned value is tested for null (before unlockImage() calls), even though the status change is always done on getRelevantDiskImage() returned value. Now what is tested for null before unlockImage() is getRelevantDiskImage(). Change-Id: Ica20a2542c07a355720503c25a14fbae3394c4d4 Bug-Url: https://bugzilla.redhat.com/868887 Signed-off-by: Vered Volansky <vvolansk(a)redhat.com&gt; --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/BaseImagesCommand.java 1 file changed, 2 insertions(+), 4 deletions(-) Approvals: Tal Nisan: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/11833 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ica20a2542c07a355720503c25a14fbae3394c4d4 Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Vered Volansky <vvolansk(a)redhat.com&gt; Gerrit-Reviewer: Alissa Bonas <abonas(a)redhat.com&gt; Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com&gt; Gerrit-Reviewer: Liron Aravot <laravot(a)redhat.com&gt; Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com&gt; Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com&gt; Gerrit-Reviewer: Vered Volansky <vvolansk(a)redhat.com&gt;