From 2189c1639cac46a17322da8bdf8de6e90a515989 Mon Sep 17 00:00:00 2001
From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Tue, 26 Feb 2013 10:58:59 +0100
Subject: [PATCH] Fix deadlock in Service::BeginExecuteCheck().

---
 lib/icinga/service-check.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/icinga/service-check.cpp b/lib/icinga/service-check.cpp
index 175d17996..78895cf05 100644
--- a/lib/icinga/service-check.cpp
+++ b/lib/icinga/service-check.cpp
@@ -418,9 +418,10 @@ void Service::BeginExecuteCheck(const Service::Ptr& self, const function<void (v
 	{
 		ObjectLock olock(host);
 		macroDicts.push_back(host->GetMacros());
-		macroDicts.push_back(Host::CalculateDynamicMacros(host));
 	}
 
+	macroDicts.push_back(Host::CalculateDynamicMacros(host));
+
 	IcingaApplication::Ptr app = IcingaApplication::GetInstance();
 
 	{
-- 
2.40.0