]> granicus.if.org Git - icinga2/commitdiff
Fix another potential deadlock in DB IDO
authorGunnar Beutner <gunnar@beutner.name>
Wed, 22 Apr 2015 19:35:43 +0000 (21:35 +0200)
committerGunnar Beutner <gunnar@beutner.name>
Wed, 22 Apr 2015 19:36:35 +0000 (21:36 +0200)
refs #9121

lib/db_ido/hostdbobject.cpp

index 231742a7a005d09aad6adeecdbcef043ab25e43f..3210c309531fdf626459fafada6fedda368c8306 100644 (file)
@@ -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));