From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Fri, 20 Dec 2013 12:16:03 +0000 (+0100)
Subject: Don't cache config item properties.
X-Git-Tag: v0.0.7~58
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3e5af43e4d0e0b7363aa2165eb47f49d5692dd5a;p=icinga2

Don't cache config item properties.

Refs #5400
---

diff --git a/lib/config/configitem.cpp b/lib/config/configitem.cpp
index 2b61b895d..fb979b5cc 100644
--- a/lib/config/configitem.cpp
+++ b/lib/config/configitem.cpp
@@ -141,12 +141,9 @@ Dictionary::Ptr ConfigItem::GetProperties(void)
 {
 	ASSERT(OwnsLock());
 
-	if (!m_Properties) {
-		m_Properties = make_shared<Dictionary>();
-		GetLinkedExpressionList()->Execute(m_Properties);
-	}
-
-	return m_Properties;
+	Dictionary::Ptr properties = make_shared<Dictionary>();
+	GetLinkedExpressionList()->Execute(properties);
+	return properties;
 }
 
 /**
diff --git a/lib/config/configitem.h b/lib/config/configitem.h
index 69b66a392..506678539 100644
--- a/lib/config/configitem.h
+++ b/lib/config/configitem.h
@@ -78,7 +78,6 @@ private:
 	DebugInfo m_DebugInfo; /**< Debug information. */
 
 	ExpressionList::Ptr m_LinkedExpressionList;
-	Dictionary::Ptr m_Properties;
         
         DynamicObject::Ptr m_Object;