From 38aa231a2da0a671dd43f4bbcef59cc1b7924a90 Mon Sep 17 00:00:00 2001
From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Fri, 20 Dec 2013 13:15:05 +0100
Subject: [PATCH] Discard unused config items as early as possibly.

Refs #5400
---
 icinga-app/icinga.cpp     | 3 ---
 lib/config/configitem.cpp | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/icinga-app/icinga.cpp b/icinga-app/icinga.cpp
index 5995dc1b6..db96393cb 100644
--- a/icinga-app/icinga.cpp
+++ b/icinga-app/icinga.cpp
@@ -113,9 +113,6 @@ static bool LoadConfigFiles(const String& appType, bool validateOnly)
 	if (!result)
 		return false;
 
-	ConfigItem::DiscardItems();
-	ConfigType::DiscardTypes();
-
 	return true;
 }
 
diff --git a/lib/config/configitem.cpp b/lib/config/configitem.cpp
index b606bc382..2b61b895d 100644
--- a/lib/config/configitem.cpp
+++ b/lib/config/configitem.cpp
@@ -313,6 +313,9 @@ bool ConfigItem::ActivateItems(bool validateOnly)
 
 	upq.Join();
 
+	ConfigItem::DiscardItems();
+	ConfigType::DiscardTypes();
+
 	/* log stats for external parsers */
 	BOOST_FOREACH(const DynamicType::Ptr& type, DynamicType::GetTypes()) {
 		if (type->GetObjects().size() > 0)
-- 
2.40.0