From 21cf767488685bc6e154f5ce7c69f1f14da19a54 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Wed, 22 Apr 2015 21:35:43 +0200 Subject: [PATCH] Fix another potential deadlock in DB IDO refs #9121 --- lib/db_ido/hostdbobject.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) 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)); -- 2.40.0