Fix validator for dependencies

fixes #8596

diff --git a/lib/config/configitem.cpp b/lib/config/configitem.cpp
index c1b02a5e74669bd7484187bcfa7448893293f7cc..2dc9ae0c6966d890d4c3d8f6eae1b5473e506e32 100644 (file)
--- a/lib/config/configitem.cpp
+++ b/lib/config/configitem.cpp
@@ -360,6 +360,9 @@ bool ConfigItem::CommitNewItems(WorkQueue& upq)
                        }
 
                        upq.Join();
+
+                       if (upq.HasExceptions())
+                               return false;
                }
        } while (!items.empty());
 

diff --git a/lib/icinga/dependency.cpp b/lib/icinga/dependency.cpp
index 59aa76d5b28a0f8b0ff8dab57a25efe09fb6588a..214b16dfbe627f98069ee2330453ae4cb3d3c670 100644 (file)
--- a/lib/icinga/dependency.cpp
+++ b/lib/icinga/dependency.cpp
@@ -77,7 +77,7 @@ void Dependency::OnAllConfigLoaded(void)
        }
        
        if (!m_Child)
-               BOOST_THROW_EXCEPTION(ScriptError("Dependency '" << GetName() << "' references a child host/service which doesn't exist.", GetDebugInfo()));
+               BOOST_THROW_EXCEPTION(ScriptError("Dependency '" + GetName() + "' references a child host/service which doesn't exist.", GetDebugInfo()));
 
        m_Child->AddDependency(this);
 
@@ -96,7 +96,7 @@ void Dependency::OnAllConfigLoaded(void)
        }
        
        if (!m_Parent)
-               BOOST_THROW_EXCEPTION(ScriptError("Dependency '" << GetName() << "' references a parent host/service which doesn't exist.", GetDebugInfo()));
+               BOOST_THROW_EXCEPTION(ScriptError("Dependency '" + GetName() + "' references a parent host/service which doesn't exist.", GetDebugInfo()));
 
        m_Parent->AddReverseDependency(this);
 }