From: Gunnar Beutner <gunnar@beutner.name>
Date: Mon, 20 Apr 2015 13:39:45 +0000 (+0200)
Subject: Fix deadlock in the IDO
X-Git-Tag: v2.3.5~72
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8bf8ef263ddfdfb0578aa562c4f128a0476a7665;p=icinga2

Fix deadlock in the IDO

fixes #9121
---

diff --git a/lib/db_ido/servicedbobject.cpp b/lib/db_ido/servicedbobject.cpp
index 6f9467455..bae4b3f54 100644
--- a/lib/db_ido/servicedbobject.cpp
+++ b/lib/db_ido/servicedbobject.cpp
@@ -140,11 +140,8 @@ Dictionary::Ptr ServiceDbObject::GetStatusFields(void) const
 	fields->Set("next_notification", DbValue::FromTimestamp(CompatUtility::GetCheckableNotificationNextNotification(service)));
 	fields->Set("no_more_notifications", Empty);
 	fields->Set("notifications_enabled", CompatUtility::GetCheckableNotificationsEnabled(service));
-	{
-		ObjectLock olock(service);
-		fields->Set("problem_has_been_acknowledged", CompatUtility::GetCheckableProblemHasBeenAcknowledged(service));
-		fields->Set("acknowledgement_type", CompatUtility::GetCheckableAcknowledgementType(service));
-	}
+	fields->Set("problem_has_been_acknowledged", CompatUtility::GetCheckableProblemHasBeenAcknowledged(service));
+	fields->Set("acknowledgement_type", CompatUtility::GetCheckableAcknowledgementType(service));
 	fields->Set("current_notification_number", CompatUtility::GetCheckableNotificationNotificationNumber(service));
 	fields->Set("passive_checks_enabled", CompatUtility::GetCheckablePassiveChecksEnabled(service));
 	fields->Set("active_checks_enabled", CompatUtility::GetCheckableActiveChecksEnabled(service));