tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix deadlock in ServiceDbConnect::Add{Comments,Downtimes}. 

Fixes #5286
This commit is contained in:
Gunnar Beutner 2013-12-09 13:22:50 +01:00
parent 03a0815357
commit 3d7c103035
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/db_ido/servicedbobject.cpp
View File

@ -325,11 +325,11 @@ void ServiceDbObject::AddComments(const Service::Ptr& service)
/* dump all comments */ /* dump all comments */
Dictionary::Ptr comments = service->GetComments(); Dictionary::Ptr comments = service->GetComments();
ObjectLock olock(comments);
if (comments->GetLength() > 0) if (comments->GetLength() > 0)
RemoveComments(service); RemoveComments(service);
ObjectLock olock(comments);
BOOST_FOREACH(const Dictionary::Pair& kv, comments) { BOOST_FOREACH(const Dictionary::Pair& kv, comments) {
AddComment(service, kv.second); AddComment(service, kv.second);
} }
@ -490,11 +490,11 @@ void ServiceDbObject::AddDowntimes(const Service::Ptr& service)
/* dump all downtimes */ /* dump all downtimes */
Dictionary::Ptr downtimes = service->GetDowntimes(); Dictionary::Ptr downtimes = service->GetDowntimes();
ObjectLock olock(downtimes);
if (downtimes->GetLength() > 0) if (downtimes->GetLength() > 0)
RemoveDowntimes(service); RemoveDowntimes(service);
ObjectLock olock(downtimes);
BOOST_FOREACH(const Dictionary::Pair& kv, downtimes) { BOOST_FOREACH(const Dictionary::Pair& kv, downtimes) {
AddDowntime(service, kv.second); AddDowntime(service, kv.second);
} }