]> granicus.if.org Git - icinga2/commitdiff
Don't cache config item properties.
authorGunnar Beutner <gunnar.beutner@netways.de>
Fri, 20 Dec 2013 12:16:03 +0000 (13:16 +0100)
committerGunnar Beutner <gunnar.beutner@netways.de>
Fri, 20 Dec 2013 12:31:13 +0000 (13:31 +0100)
Refs #5400

lib/config/configitem.cpp
lib/config/configitem.h

index 2b61b895d0fe56e0667fc0632eaae4dd2e3e6f65..fb979b5cc77f6bf60e9cfc9d4399ad6967f55835 100644 (file)
@@ -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;
 }
 
 /**
index 69b66a392a754abfa25a15c65b4c529fb82e563c..506678539615de180b02bab277cbb976633c5852 100644 (file)
@@ -78,7 +78,6 @@ private:
        DebugInfo m_DebugInfo; /**< Debug information. */
 
        ExpressionList::Ptr m_LinkedExpressionList;
-       Dictionary::Ptr m_Properties;
         
         DynamicObject::Ptr m_Object;