From: Gunnar Beutner <gunnar@beutner.name>
Date: Mon, 30 Nov 2015 14:31:11 +0000 (+0100)
Subject: Fix incorrect return value for ApiListener::GetInstance
X-Git-Tag: v2.5.0~677
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fd65fed6f0eac68b375daabf15b529b967796d96;p=icinga2

Fix incorrect return value for ApiListener::GetInstance

refs #10711
---

diff --git a/lib/remote/apilistener.cpp b/lib/remote/apilistener.cpp
index 2deb0329a..d4269d8c9 100644
--- a/lib/remote/apilistener.cpp
+++ b/lib/remote/apilistener.cpp
@@ -53,6 +53,11 @@ ApiListener::ApiListener(void)
 
 void ApiListener::OnConfigLoaded(void)
 {
+	if (m_Instance)
+		BOOST_THROW_EXCEPTION(ScriptError("Only one ApiListener object is allowed.", GetDebugInfo()));
+
+	m_Instance = this;
+
 	/* set up SSL context */
 	boost::shared_ptr<X509> cert;
 	try {
@@ -104,11 +109,6 @@ void ApiListener::Start(bool runtimeCreated)
 {
 	SyncZoneDirs();
 
-	if (m_Instance)
-		BOOST_THROW_EXCEPTION(ScriptError("Only one ApiListener object is allowed.", GetDebugInfo()));
-
-	m_Instance = this;
-
 	ObjectImpl<ApiListener>::Start(runtimeCreated);
 
 	{