Roy Golan has submitted this change and it was merged. Change subject: Pass internal policy unit info to ClusterPolicyDao ...................................................................... Pass internal policy unit info to ClusterPolicyDao ClusterPolicyDao needs extra information to properly reconstruct custom cluster policies when internal policy units are assigned to it. The missing information caused NPE when trying to get the type of internal policy unit. Change-Id: I868a12ca073fcba12ac108daea45dcc7750d2274 Signed-off-by: Martin Sivak <msivak@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/SchedulingManager.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/scheduling/SchedulingManagerTest.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/scheduling/ClusterPolicyDao.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/scheduling/ClusterPolicyDaoImpl.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/ClusterDaoTest.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/ClusterPolicyDaoTest.java 6 files changed, 68 insertions(+), 24 deletions(-) Approvals: Martin Sivák: Verified Martin Peřina: Verified; Looks good to me, but someone else must approve Jenkins CI: Passed CI tests Roy Golan: Looks good to me, approved -- To view, visit https://gerrit.ovirt.org/55696 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I868a12ca073fcba12ac108daea45dcc7750d2274 Gerrit-PatchSet: 3 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Sivák <msivak@redhat.com> Gerrit-Reviewer: Eli Mesika <emesika@redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Marek Libra <mlibra@redhat.com> Gerrit-Reviewer: Martin Peřina <mperina@redhat.com> Gerrit-Reviewer: Martin Sivák <msivak@redhat.com> Gerrit-Reviewer: Roman Mohr <rmohr@redhat.com> Gerrit-Reviewer: Roy Golan <rgolan@redhat.com> Gerrit-Reviewer: Tomer Saban <tsaban@redhat.com> Gerrit-Reviewer: gerrit-hooks <automation@ovirt.org>