Fix incorrect error messages for apply-for

fixes #10205

diff --git a/lib/icinga/dependency-apply.cpp b/lib/icinga/dependency-apply.cpp
index 2c1d561df502c637d0359a5e995649ab137d89f1..44913cd79acda4b942480a2d66319f86df612ada 100644 (file)
--- a/lib/icinga/dependency-apply.cpp
+++ b/lib/icinga/dependency-apply.cpp
@@ -119,7 +119,7 @@ bool Dependency::EvaluateApplyRule(const Checkable::Ptr& checkable, const ApplyR
 
        if (vinstances.IsObjectType<Array>()) {
                if (!rule.GetFVVar().IsEmpty())
-                       BOOST_THROW_EXCEPTION(ScriptError("Array iterator requires value to be an array.", di));
+                       BOOST_THROW_EXCEPTION(ScriptError("Dictionary iterator requires value to be a dictionary.", di));
 
                Array::Ptr arr = vinstances;
                Array::Ptr arrclone = arr->ShallowClone();
@@ -138,7 +138,7 @@ bool Dependency::EvaluateApplyRule(const Checkable::Ptr& checkable, const ApplyR
                }
        } else if (vinstances.IsObjectType<Dictionary>()) {
                if (rule.GetFVVar().IsEmpty())
-                       BOOST_THROW_EXCEPTION(ScriptError("Dictionary iterator requires value to be a dictionary.", di));
+                       BOOST_THROW_EXCEPTION(ScriptError("Array iterator requires value to be an array.", di));
        
                Dictionary::Ptr dict = vinstances;
 

diff --git a/lib/icinga/notification-apply.cpp b/lib/icinga/notification-apply.cpp
index fb77d6962ca0a023e11ed636c8deca7ed997366b..e298cb0fc831e4a4ac0af35f256cb8a79469f7b8 100644 (file)
--- a/lib/icinga/notification-apply.cpp
+++ b/lib/icinga/notification-apply.cpp
@@ -118,7 +118,7 @@ bool Notification::EvaluateApplyRule(const Checkable::Ptr& checkable, const Appl
 
        if (vinstances.IsObjectType<Array>()) {
                if (!rule.GetFVVar().IsEmpty())
-                       BOOST_THROW_EXCEPTION(ScriptError("Array iterator requires value to be an array.", di));
+                       BOOST_THROW_EXCEPTION(ScriptError("Dictionary iterator requires value to be a dictionary.", di));
 
                Array::Ptr arr = vinstances;
 
@@ -136,7 +136,7 @@ bool Notification::EvaluateApplyRule(const Checkable::Ptr& checkable, const Appl
                }
        } else if (vinstances.IsObjectType<Dictionary>()) {
                if (rule.GetFVVar().IsEmpty())
-                       BOOST_THROW_EXCEPTION(ScriptError("Dictionary iterator requires value to be a dictionary.", di));
+                       BOOST_THROW_EXCEPTION(ScriptError("Array iterator requires value to be an array.", di));
        
                Dictionary::Ptr dict = vinstances;
 

diff --git a/lib/icinga/scheduleddowntime-apply.cpp b/lib/icinga/scheduleddowntime-apply.cpp
index 426ac717fb153408d3d40987398a81c10a323b02..59fd4f90e5a3e53d60a243152b744d559c10d8f4 100644 (file)
--- a/lib/icinga/scheduleddowntime-apply.cpp
+++ b/lib/icinga/scheduleddowntime-apply.cpp
@@ -117,7 +117,7 @@ bool ScheduledDowntime::EvaluateApplyRule(const Checkable::Ptr& checkable, const
 
        if (vinstances.IsObjectType<Array>()) {
                if (!rule.GetFVVar().IsEmpty())
-                       BOOST_THROW_EXCEPTION(ScriptError("Array iterator requires value to be an array.", di));
+                       BOOST_THROW_EXCEPTION(ScriptError("Dictionary iterator requires value to be a dictionary.", di));
 
                Array::Ptr arr = vinstances;
                Array::Ptr arrclone = arr->ShallowClone();
@@ -136,7 +136,7 @@ bool ScheduledDowntime::EvaluateApplyRule(const Checkable::Ptr& checkable, const
                }
        } else if (vinstances.IsObjectType<Dictionary>()) {
                if (rule.GetFVVar().IsEmpty())
-                       BOOST_THROW_EXCEPTION(ScriptError("Dictionary iterator requires value to be a dictionary.", di));
+                       BOOST_THROW_EXCEPTION(ScriptError("Array iterator requires value to be an array.", di));
        
                Dictionary::Ptr dict = vinstances;
 

diff --git a/lib/icinga/service-apply.cpp b/lib/icinga/service-apply.cpp
index 67896d143dc44688657232877fdb6cf431583812..07a8a760ca4e5d59dfdf1d5f9cc6d03a3766fa10 100644 (file)
--- a/lib/icinga/service-apply.cpp
+++ b/lib/icinga/service-apply.cpp
@@ -105,7 +105,7 @@ bool Service::EvaluateApplyRule(const Host::Ptr& host, const ApplyRule& rule)
 
        if (vinstances.IsObjectType<Array>()) {
                if (!rule.GetFVVar().IsEmpty())
-                       BOOST_THROW_EXCEPTION(ScriptError("Array iterator requires value to be an array.", di));
+                       BOOST_THROW_EXCEPTION(ScriptError("Dictionary iterator requires value to be a dictionary.", di));
 
                Array::Ptr arr = vinstances;
                Array::Ptr arrclone = arr->ShallowClone();
@@ -124,7 +124,7 @@ bool Service::EvaluateApplyRule(const Host::Ptr& host, const ApplyRule& rule)
                }
        } else if (vinstances.IsObjectType<Dictionary>()) {
                if (rule.GetFVVar().IsEmpty())
-                       BOOST_THROW_EXCEPTION(ScriptError("Dictionary iterator requires value to be a dictionary.", di));
+                       BOOST_THROW_EXCEPTION(ScriptError("Array iterator requires value to be an array.", di));
        
                Dictionary::Ptr dict = vinstances;