From: Michael Friedrich <michael.friedrich@netways.de>
Date: Mon, 27 Apr 2015 08:59:53 +0000 (+0200)
Subject: Fix failed assertion in DB IDO
X-Git-Tag: v2.4.0~686
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e37cd25ed4388454864ae8a79859d2a5a57515e9;p=icinga2

Fix failed assertion in DB IDO

fixes #9121
---

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<AcknowledgementType>(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);