tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-31 01:24:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improve error message for invalid inline service definitions.

Browse Source 
Refs #5846
This commit is contained in:
Gunnar Beutner 2014-03-24 11:23:05 +01:00
parent 4ec939f332
commit 8bfb60b7fa
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/base/array.cpp
View File

@ -157,6 +157,14 @@ void Array::Resize(size_t new_size)
m_Data.resize(new_size); m_Data.resize(new_size);
} }
void Array::Clear(void)
{
ASSERT(!OwnsLock());
ObjectLock olock(this);
m_Data.clear();
}
void Array::CopyTo(const Array::Ptr& dest) const void Array::CopyTo(const Array::Ptr& dest) const
{ {
ASSERT(!OwnsLock()); ASSERT(!OwnsLock());

1
lib/base/array.h
View File

@ -56,6 +56,7 @@ public:
void Remove(Iterator it); void Remove(Iterator it);
void Resize(size_t new_size); void Resize(size_t new_size);
void Clear(void);
void CopyTo(const Array::Ptr& dest) const; void CopyTo(const Array::Ptr& dest) const;
Array::Ptr ShallowClone(void) const; Array::Ptr ShallowClone(void) const;

7
lib/config/aexpression.cpp
View File

@ -68,7 +68,12 @@ void AExpression::ExtractPath(const std::vector<String>& path, const Array::Ptr&
AExpression::Ptr exprl = m_Operand2; AExpression::Ptr exprl = m_Operand2;
if (path.size() == 1) { if (path.size() == 1) {
VERIFY(exprl->m_Operator == &AExpression::OpDict); if (m_Operator == &AExpression::OpSet)
result->Clear();
if (exprl->m_Operator != &AExpression::OpDict)
BOOST_THROW_EXCEPTION(ConfigError("The '" + path[0] + "' attribute must be a dictionary.") << errinfo_debuginfo(m_DebugInfo));
Array::Ptr subexprl = exprl->m_Operand1; Array::Ptr subexprl = exprl->m_Operand1;
ObjectLock olock(subexprl); ObjectLock olock(subexprl);
BOOST_FOREACH(const AExpression::Ptr& expr, subexprl) { BOOST_FOREACH(const AExpression::Ptr& expr, subexprl) {