]> granicus.if.org Git - icinga2/commitdiff
Don't convert loop variables to string when using apply-for
authorGunnar Beutner <gunnar@beutner.name>
Tue, 24 Feb 2015 16:51:16 +0000 (17:51 +0100)
committerGunnar Beutner <gunnar@beutner.name>
Tue, 24 Feb 2015 16:51:16 +0000 (17:51 +0100)
fixes #8519

lib/icinga/dependency-apply.cpp
lib/icinga/notification-apply.cpp
lib/icinga/scheduleddowntime-apply.cpp
lib/icinga/service-apply.cpp

index 07ccf762a0cd4a3eb85b8bc1db875e738e3aa284..119a7cd912bd2aeb199cd78eb163394415cb9e7a 100644 (file)
@@ -123,7 +123,7 @@ bool Dependency::EvaluateApplyRule(const Checkable::Ptr& checkable, const ApplyR
                Array::Ptr arrclone = arr->ShallowClone();
 
                ObjectLock olock(arrclone);
-               BOOST_FOREACH(const String& instance, arrclone) {
+               BOOST_FOREACH(const Value& instance, arrclone) {
                        String name = rule.GetName();
 
                        if (!rule.GetFKVar().IsEmpty()) {
index 16a8f9d096616d8c5f39caf731a3724e053c3835..8112aa31044758591bf6360dd2c259b3c610851c 100644 (file)
@@ -121,7 +121,7 @@ bool Notification::EvaluateApplyRule(const Checkable::Ptr& checkable, const Appl
                Array::Ptr arr = vinstances;
 
                ObjectLock olock(arr);
-               BOOST_FOREACH(const String& instance, arr) {
+               BOOST_FOREACH(const Value& instance, arr) {
                        String name = rule.GetName();
 
                        if (!rule.GetFKVar().IsEmpty()) {
index 9180ef4772917c4235c37d82105b558323a2182d..452f75b0807e75841bb93294e1066735a172aa80 100644 (file)
@@ -121,7 +121,7 @@ bool ScheduledDowntime::EvaluateApplyRule(const Checkable::Ptr& checkable, const
                Array::Ptr arrclone = arr->ShallowClone();
 
                ObjectLock olock(arrclone);
-               BOOST_FOREACH(const String& instance, arrclone) {
+               BOOST_FOREACH(const Value& instance, arrclone) {
                        String name = rule.GetName();
 
                        if (!rule.GetFKVar().IsEmpty()) {
index 8e28a50781a6b4be087850d77a8d8c80a4fe0cf8..167abd0a0e8ba0f2ad44df685639e106c83ae8e9 100644 (file)
@@ -109,7 +109,7 @@ bool Service::EvaluateApplyRule(const Host::Ptr& host, const ApplyRule& rule)
                Array::Ptr arrclone = arr->ShallowClone();
 
                ObjectLock olock(arrclone);
-               BOOST_FOREACH(const String& instance, arrclone) {
+               BOOST_FOREACH(const Value& instance, arrclone) {
                        String name = rule.GetName();
 
                        if (!rule.GetFKVar().IsEmpty()) {