Tal Nisan has submitted this change and it was merged. Change subject: scheduler: Let AffinityGroup always return empty lists ...................................................................... scheduler: Let AffinityGroup always return empty lists Sometimes an AffinityGroup is created without VMs in it. Make sure that all lists it returns are never null for safer usage. Bug-Url: https://bugzilla.redhat.com/1251742 Change-Id: I0b504d99ab0cbe0f37b2eb3429d871aa207584ad Signed-off-by: Roman Mohr <rmohr(a)redhat.com&gt; (cherry picked from commit 0bc6473e435804c1eff10eb7ee512db3c204d447) --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/arem/AffinityRulesUtils.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/scheduling/AffinityGroup.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/AffinityGroupDaoTest.java 3 files changed, 10 insertions(+), 9 deletions(-) Approvals: Roman Mohr: Verified Jenkins CI: Passed CI tests Roy Golan: Looks good to me, approved -- To view, visit https://gerrit.ovirt.org/45741 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0b504d99ab0cbe0f37b2eb3429d871aa207584ad Gerrit-PatchSet: 3 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.6 Gerrit-Owner: Roman Mohr <rmohr(a)redhat.com&gt; Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Roman Mohr <rmohr(a)redhat.com&gt; Gerrit-Reviewer: Roy Golan <rgolan(a)redhat.com&gt; Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com&gt; Gerrit-Reviewer: automation(a)ovirt.org