Tal Nisan has submitted this change and it was merged. ( https://gerrit.ovirt.org/81151 ) Change subject: core: Change Optional.of() to Optional.ofNullable() ...................................................................... core: Change Optional.of() to Optional.ofNullable() In case of receiving an empty list of images, and in order to avoid from dealing with a NullPointerException, it's better to use Optional.ofNullable() instead of Optional.of(). Change-Id: I2237d7329032d465a5e5ad61926598cbfa458c60 Bug-Url: https://bugzilla.redhat.com/1485951 Signed-off-by: Shani Leviim <sleviim(a)redhat.com&gt; --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/repoimage/GetImagesListQueryBase.java 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins CI: Passed CI tests Allon Mureinik: Looks good to me, approved Shani Leviim: Verified -- To view, visit https://gerrit.ovirt.org/81151 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2237d7329032d465a5e5ad61926598cbfa458c60 Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Shani Leviim <sleviim(a)redhat.com&gt; Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com&gt; Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com&gt; Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com&gt; Gerrit-Reviewer: Shani Leviim <sleviim(a)redhat.com&gt; Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com&gt; Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org&gt;