From 8bf8ef263ddfdfb0578aa562c4f128a0476a7665 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Mon, 20 Apr 2015 15:39:45 +0200 Subject: [PATCH] Fix deadlock in the IDO fixes #9121 --- lib/db_ido/servicedbobject.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) 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));