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

Fix incorrectly resolved macros

Browse Source 
refs #7564
This commit is contained in:
Gunnar Beutner 2015-01-28 15:48:08 +01:00
parent 235c7348f4
commit ea3c3e0c3e
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/icinga/macroprocessor.cpp
View File

@ -241,16 +241,19 @@ Value MacroProcessor::InternalResolveMacros(const String& str, const ResolverLis
if (recursive_macro) { if (recursive_macro) {
if (resolved_macro.IsObjectType<Array>()) { if (resolved_macro.IsObjectType<Array>()) {
Array::Ptr arr = resolved_macro; Array::Ptr arr = resolved_macro;
Array::Ptr result = new Array(); Array::Ptr resolved_arr = new Array();
ObjectLock olock(arr); ObjectLock olock(arr);
BOOST_FOREACH(Value& value, arr) { BOOST_FOREACH(const Value& value, arr) {
result->Add(InternalResolveMacros(value, if (value.IsScalar()) {
resolvers, cr, missingMacro, EscapeCallback(), Dictionary::Ptr(), resolved_arr->Add(InternalResolveMacros(value,
false, recursionLevel + 1)); resolvers, cr, missingMacro, EscapeCallback(), Dictionary::Ptr(),
false, recursionLevel + 1));
} else
resolved_arr->Add(value);
} }
resolved_macro = result; resolved_macro = resolved_arr;
} else } else
resolved_macro = InternalResolveMacros(resolved_macro, resolved_macro = InternalResolveMacros(resolved_macro,
resolvers, cr, missingMacro, EscapeCallback(), Dictionary::Ptr(), resolvers, cr, missingMacro, EscapeCallback(), Dictionary::Ptr(),