From e37cd25ed4388454864ae8a79859d2a5a57515e9 Mon Sep 17 00:00:00 2001 From: Michael Friedrich Date: Mon, 27 Apr 2015 10:59:53 +0200 Subject: [PATCH] Fix failed assertion in DB IDO fixes #9121 --- lib/icinga/checkable.cpp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/lib/icinga/checkable.cpp b/lib/icinga/checkable.cpp index 6ec3294c3..a03f4de4d 100644 --- a/lib/icinga/checkable.cpp +++ b/lib/icinga/checkable.cpp @@ -102,8 +102,6 @@ void Checkable::AddGroup(const String& name) AcknowledgementType Checkable::GetAcknowledgement(void) { - ASSERT(OwnsLock()); - AcknowledgementType avalue = static_cast(GetAcknowledgementRaw()); if (avalue != AcknowledgementNone) { @@ -125,12 +123,8 @@ bool Checkable::IsAcknowledged(void) void Checkable::AcknowledgeProblem(const String& author, const String& comment, AcknowledgementType type, bool notify, double expiry, const MessageOrigin& origin) { - { - ObjectLock olock(this); - - SetAcknowledgementRaw(type); - SetAcknowledgementExpiry(expiry); - } + SetAcknowledgementRaw(type); + SetAcknowledgementExpiry(expiry); if (notify) OnNotificationsRequested(this, NotificationAcknowledgement, GetLastCheckResult(), author, comment); @@ -140,8 +134,6 @@ void Checkable::AcknowledgeProblem(const String& author, const String& comment, void Checkable::ClearAcknowledgement(const MessageOrigin& origin) { - ASSERT(OwnsLock()); - SetAcknowledgementRaw(AcknowledgementNone); SetAcknowledgementExpiry(0);