From: Gunnar Beutner <gunnar@beutner.name>
Date: Wed, 22 Apr 2015 19:35:43 +0000 (+0200)
Subject: Fix another potential deadlock in DB IDO
X-Git-Tag: v2.3.5~71
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=21cf767488685bc6e154f5ce7c69f1f14da19a54;p=icinga2

Fix another potential deadlock in DB IDO

refs #9121
---

diff --git a/lib/db_ido/hostdbobject.cpp b/lib/db_ido/hostdbobject.cpp
index 231742a7a..3210c3095 100644
--- a/lib/db_ido/hostdbobject.cpp
+++ b/lib/db_ido/hostdbobject.cpp
@@ -144,11 +144,8 @@ Dictionary::Ptr HostDbObject::GetStatusFields(void) const
 	fields->Set("next_notification", DbValue::FromTimestamp(CompatUtility::GetCheckableNotificationNextNotification(host)));
 	fields->Set("no_more_notifications", Empty);
 	fields->Set("notifications_enabled", CompatUtility::GetCheckableNotificationsEnabled(host));
-	{
-		ObjectLock olock(host);
-		fields->Set("problem_has_been_acknowledged", CompatUtility::GetCheckableProblemHasBeenAcknowledged(host));
-		fields->Set("acknowledgement_type", CompatUtility::GetCheckableAcknowledgementType(host));
-	}
+	fields->Set("problem_has_been_acknowledged", CompatUtility::GetCheckableProblemHasBeenAcknowledged(host));
+	fields->Set("acknowledgement_type", CompatUtility::GetCheckableAcknowledgementType(host));
 	fields->Set("current_notification_number", CompatUtility::GetCheckableNotificationNotificationNumber(host));
 	fields->Set("passive_checks_enabled", CompatUtility::GetCheckablePassiveChecksEnabled(host));
 	fields->Set("active_checks_enabled", CompatUtility::GetCheckableActiveChecksEnabled(host));