]> granicus.if.org Git - icinga2/commitdiff
Fix deadlock in the IDO
authorGunnar Beutner <gunnar@beutner.name>
Mon, 20 Apr 2015 13:39:45 +0000 (15:39 +0200)
committerGunnar Beutner <gunnar@beutner.name>
Wed, 22 Apr 2015 19:34:22 +0000 (21:34 +0200)
fixes #9121

lib/db_ido/servicedbobject.cpp

index 6f9467455853e380666e81692b38102d4597d763..bae4b3f54d86866d6c931a068e6af24738e6ac3c 100644 (file)
@@ -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));