Allon Mureinik has submitted this change and it was merged. Change subject: ui: DiskModelByAliasComparer: null disk treatment ...................................................................... ui: DiskModelByAliasComparer: null disk treatment DiskModelByAliasComparer was checking DiskModel.getDisk() for being null, but then ignoring the check, and performing the same operation (DiskModel.getDisk().getDiskAlias()) regardless. This is obviously wrong, since if the disk is null, this will result in a NullPointerException. This patch assigns a default (empty String) as the disk alias in case the disk is null. Change-Id: I2d060a5b9d87dc3ec7bcc382d90a4f2825ca9a05 Signed-off-by: Allon Mureinik <amureini@redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Linq.java 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Allon Mureinik: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/12346 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2d060a5b9d87dc3ec7bcc382d90a4f2825ca9a05 Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <amureini@redhat.com> Gerrit-Reviewer: Alissa Bonas <abonas@redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini@redhat.com> Gerrit-Reviewer: Daniel Erez <derez@redhat.com> Gerrit-Reviewer: Liron Aravot <laravot@redhat.com> Gerrit-Reviewer: Maor Lipchuk <mlipchuk@redhat.com> Gerrit-Reviewer: Tal Nisan <tnisan@redhat.com> Gerrit-Reviewer: Vered Volansky <vvolansk@redhat.com>