]> granicus.if.org Git - icinga2/commitdiff
Fix incorrect return value for ConfigItem::ActivateItems
authorGunnar Beutner <gunnar@beutner.name>
Thu, 29 Jan 2015 13:40:49 +0000 (14:40 +0100)
committerGunnar Beutner <gunnar@beutner.name>
Thu, 29 Jan 2015 13:40:49 +0000 (14:40 +0100)
refs #8309

lib/config/configitem.cpp

index fbb59eb1543b6688d107a57f07abe8694afc9dd8..4f4102a5bcdbdb4b57a285f6aa4148887e8b6261 100644 (file)
@@ -381,7 +381,11 @@ bool ConfigItem::ActivateItems(void)
        }
 
        upq.Join();
-       upq.ReportExceptions("ConfigItem");
+
+       if (upq.HasExceptions()) {
+               upq.ReportExceptions("ConfigItem");
+               return false;
+       }
 
 #ifdef I2_DEBUG
        BOOST_FOREACH(const DynamicType::Ptr& type, DynamicType::GetTypes()) {