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

Fix incorrect locks

This commit is contained in:
Gunnar Beutner 2014-10-28 18:57:30 +01:00
parent a5684ea2ac
commit c10da708ff
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/config/configitem.cpp
View File

@ -120,7 +120,9 @@ Expression::Ptr ConfigItem::GetExpressionList(void) const
Dictionary::Ptr ConfigItem::GetProperties(void)
{
ASSERT(OwnsLock());
ASSERT(!OwnsLock());
ObjectLock olock(this);
if (!m_Properties) {
DebugHint dhint;
@ -186,15 +188,7 @@ DynamicObject::Ptr ConfigItem::Commit(void)
if (IsAbstract())
return DynamicObject::Ptr();
Dictionary::Ptr properties;
{
ObjectLock olock(this);
properties = GetProperties();
}
DynamicObject::Ptr dobj = dtype->CreateObject(properties);
DynamicObject::Ptr dobj = dtype->CreateObject(GetProperties());
dobj->SetDebugInfo(m_DebugInfo);
dobj->Register();
@ -307,10 +301,7 @@ void ConfigItem::WriteObjectsFile(const String& filename)
persistentItem->Set("type", item->GetType());
persistentItem->Set("name", item->GetName());
persistentItem->Set("abstract", item->IsAbstract());
{
ObjectLock olock(item);
persistentItem->Set("properties", item->GetProperties());
}
persistentItem->Set("properties", item->GetProperties());
persistentItem->Set("debug_hints", item->GetDebugHints());
String json = JsonEncode(persistentItem);