]> granicus.if.org Git - icinga2/commitdiff
Bugfix: services property doesn't work when the first host definition is abstract.
authorGunnar Beutner <gunnar.beutner@netways.de>
Mon, 15 Oct 2012 06:45:14 +0000 (08:45 +0200)
committerGunnar Beutner <gunnar.beutner@netways.de>
Mon, 15 Oct 2012 06:45:14 +0000 (08:45 +0200)
Fixes #3300

lib/icinga/host.cpp
lib/icinga/host.h

index 95fe7e0a3b0004d55b2e6caa02f7e6ee3267fe85..b402780f0731e5ec3555d4720e0760dc165ccdaf 100644 (file)
@@ -29,8 +29,8 @@ Host::Host(const Dictionary::Ptr& properties)
        : DynamicObject(properties)
 {
        if (!m_InitializerDone) {
-               ConfigItem::OnCommitted.connect(boost::bind(&Host::ObjectCommittedHandler, this, _1));
-               ConfigItem::OnRemoved.connect(boost::bind(&Host::ObjectRemovedHandler, this, _1));
+               ConfigItem::OnCommitted.connect(boost::bind(&Host::ObjectCommittedHandler, _1));
+               ConfigItem::OnRemoved.connect(boost::bind(&Host::ObjectRemovedHandler, _1));
 
                m_InitializerDone = true;
        }
index 48ef812b6a480a3e84d61a91476cd1a10ff19dae..a8990b178ad7f91373c2eacad496b4bb63221112 100644 (file)
@@ -50,8 +50,8 @@ public:
 private:
        static bool m_InitializerDone;
 
-       void ObjectCommittedHandler(const ConfigItem::Ptr& item);
-       void ObjectRemovedHandler(const ConfigItem::Ptr& item);
+       static void ObjectCommittedHandler(const ConfigItem::Ptr& item);
+       static void ObjectRemovedHandler(const ConfigItem::Ptr& item);
 };
 
 }