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

Bugfix: Crash while reloading config 

Fixes #3621
This commit is contained in:
Gunnar Beutner 2013-02-03 15:47:11 +01:00
parent ba49fd38e1
commit b997462eef
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/config/configitem.cpp
View File

@ -188,8 +188,12 @@ DynamicObject::Ptr ConfigItem::Commit(void)
parent->RegisterChild(GetSelf()); parent->RegisterChild(GetSelf());
} }
/* We need to make a copy of the child objects becauuse the
* OnParentCommitted() handler is going to update the list. */
set<ConfigItem::WeakPtr> children = m_ChildObjects;
/* notify our children of the update */ /* notify our children of the update */
BOOST_FOREACH(const ConfigItem::WeakPtr wchild, m_ChildObjects) { BOOST_FOREACH(const ConfigItem::WeakPtr wchild, children) {
const ConfigItem::Ptr& child = wchild.lock(); const ConfigItem::Ptr& child = wchild.lock();
if (!child) if (!child)
@ -240,7 +244,9 @@ void ConfigItem::UnregisterFromParents(void)
{ {
BOOST_FOREACH(const String& parentName, m_Parents) { BOOST_FOREACH(const String& parentName, m_Parents) {
ConfigItem::Ptr parent = GetObject(GetType(), parentName); ConfigItem::Ptr parent = GetObject(GetType(), parentName);
parent->UnregisterChild(GetSelf());
if (parent)
parent->UnregisterChild(GetSelf());
} }
} }
@ -302,4 +308,4 @@ void ConfigItem::Dump(ostream& fp) const
fp << " {" << "\n"; fp << " {" << "\n";
m_ExpressionList->Dump(fp, 1); m_ExpressionList->Dump(fp, 1);
fp << "}" << "\n"; fp << "}" << "\n";
} }