From: Gunnar Beutner <gunnar@beutner.name>
Date: Sat, 5 Apr 2014 07:19:42 +0000 (+0200)
Subject: Fix macros.
X-Git-Tag: v0.0.10~212
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5ccdf017ac43a63394974dc6ba4401563917dcd4;p=icinga2

Fix macros.

Refs #5855
---

diff --git a/lib/icinga/host.cpp b/lib/icinga/host.cpp
index 253d76bf5..cdf5aaf50 100644
--- a/lib/icinga/host.cpp
+++ b/lib/icinga/host.cpp
@@ -369,13 +369,13 @@ bool Host::ResolveMacro(const String& macro, const CheckResult::Ptr&, String *re
 				return true;
 			}
 		}
+	}
 
-		Dictionary::Ptr vars = GetVars();
+	Dictionary::Ptr vars = GetVars();
 
-		if (vars && vars->Contains(key)) {
-			*result = vars->Get(key);
-			return true;
-		}
+	if (vars && vars->Contains(macro)) {
+		*result = vars->Get(macro);
+		return true;
 	}
 
 	return false;
diff --git a/lib/icinga/icingaapplication.cpp b/lib/icinga/icingaapplication.cpp
index a1d527536..621a70c1a 100644
--- a/lib/icinga/icingaapplication.cpp
+++ b/lib/icinga/icingaapplication.cpp
@@ -156,12 +156,13 @@ bool IcingaApplication::ResolveMacro(const String& macro, const CheckResult::Ptr
 			return true;
 		}
 
-		Dictionary::Ptr vars = GetVars();
+	}
 
-		if (vars && vars->Contains(key)) {
-			*result = vars->Get(key);
-			return true;
-		}
+	Dictionary::Ptr vars = GetVars();
+
+	if (vars && vars->Contains(macro)) {
+		*result = vars->Get(macro);
+		return true;
 	}
 
 	return false;
diff --git a/lib/icinga/service.cpp b/lib/icinga/service.cpp
index 62c4fffb8..c12f0b9ac 100644
--- a/lib/icinga/service.cpp
+++ b/lib/icinga/service.cpp
@@ -199,13 +199,13 @@ bool Service::ResolveMacro(const String& macro, const CheckResult::Ptr& cr, Stri
 				return true;
 			}
 		}
+	}
 
-		Dictionary::Ptr vars = GetVars();
+	Dictionary::Ptr vars = GetVars();
 
-		if (vars && vars->Contains(key)) {
-			*result = vars->Get(key);
-			return true;
-		}
+	if (vars && vars->Contains(macro)) {
+		*result = vars->Get(macro);
+		return true;
 	}
 
 	return false;
diff --git a/lib/icinga/user.cpp b/lib/icinga/user.cpp
index 62c0d1fe0..1feb9f8c7 100644
--- a/lib/icinga/user.cpp
+++ b/lib/icinga/user.cpp
@@ -79,13 +79,13 @@ bool User::ResolveMacro(const String& macro, const CheckResult::Ptr&, String *re
 			*result = GetDisplayName();
 			return true;
 		}
+	}
 
-		Dictionary::Ptr vars = GetVars();
+	Dictionary::Ptr vars = GetVars();
 
-		if (vars && vars->Contains(key)) {
-			*result = vars->Get(key);
-			return true;
-		}
+	if (vars && vars->Contains(macro)) {
+		*result = vars->Get(macro);
+		return true;
 	}
 
 	return false;