Liron Aravot has submitted this change and it was merged. Change subject: core: fix NPE when compensating after engine shutdown ...................................................................... core: fix NPE when compensating after engine shutdown When the engine shuts down during attachment of an SD to a DC, the compensation mechanism will fail because of an NPE when the engine is restarted. This is caused because businessEntitySnapshotDao in CommandBase is null when CompensationContext#afterComepnsationCleanup is called. Fixed by moving the creation of DefaultCompensationContext to CommandBase#postConstruct so it executes after the dependencies have been injected. Change-Id: I33866ebf866926f34e39d104151977eee948fe88 Bug-Url: https://bugzilla.redhat.com/1404727 Signed-off-by: Benny Zlotnik <bzlotnik(a)redhat.com&gt; --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Benny Zlotnik: Verified Jenkins CI: Passed CI tests Allon Mureinik: Looks good to me, but someone else must approve Moti Asayag: Looks good to me, approved -- To view, visit https://gerrit.ovirt.org/68570 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I33866ebf866926f34e39d104151977eee948fe88 Gerrit-PatchSet: 6 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Benny Zlotnik <bzlotnik(a)redhat.com&gt; Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com&gt; Gerrit-Reviewer: Amit Aviram <aaviram(a)redhat.com&gt; Gerrit-Reviewer: Benny Zlotnik <bzlotnik(a)redhat.com&gt; Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Liron Aravot <laravot(a)redhat.com&gt; Gerrit-Reviewer: Martin Peřina <mperina(a)redhat.com&gt; Gerrit-Reviewer: Moti Asayag <masayag(a)redhat.com&gt; Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com&gt; Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org&gt;