Roy Golan has submitted this change and it was merged. Change subject: core: Return emptyList to avoid possible NPE ...................................................................... core: Return emptyList to avoid possible NPE Found possible null pointer exception in the Affinity Rules Enforcement Manager. The NPE is caused when findVmViolatingPositiveAg returns null and then the method isEmpty (From the List Interface) is invoked on that value. This bug was fixed by Returning empty list instead of null. Change-Id: I92a7df2771bba55db485fc0c265dcb367c092102 Signed-off-by: Tomer Saban <tsaban(a)redhat.com&gt; --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/arem/AffinityRulesEnforcer.java 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Roman Mohr: Looks good to me, but someone else must approve Jenkins CI: Passed CI tests Tomer Saban: Verified Roy Golan: Looks good to me, approved -- To view, visit https://gerrit.ovirt.org/47994 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I92a7df2771bba55db485fc0c265dcb367c092102 Gerrit-PatchSet: 7 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Tomer Saban <tsaban(a)redhat.com&gt; Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com&gt; Gerrit-Reviewer: Roman Mohr <rmohr(a)redhat.com&gt; Gerrit-Reviewer: Roy Golan <rgolan(a)redhat.com&gt; Gerrit-Reviewer: Tomer Saban <tsaban(a)redhat.com&gt; Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org&gt;