From: Michael Friedrich <michael.friedrich@netways.de>
Date: Tue, 29 Sep 2015 14:03:38 +0000 (+0200)
Subject: Fix deadlock in ApiClient::~ApiClient()
X-Git-Tag: v2.4.0~249
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=905de04293d2650691a12f4499d3b38fa1ced422;p=icinga2

Fix deadlock in ApiClient::~ApiClient()

refs #9976
---

diff --git a/lib/remote/jsonrpcconnection.cpp b/lib/remote/jsonrpcconnection.cpp
index 128dfdc42..ed5065113 100644
--- a/lib/remote/jsonrpcconnection.cpp
+++ b/lib/remote/jsonrpcconnection.cpp
@@ -92,7 +92,8 @@ ConnectionRole JsonRpcConnection::GetRole(void) const
 
 void JsonRpcConnection::SendMessage(const Dictionary::Ptr& message)
 {
-	m_WriteQueue.Enqueue(boost::bind(&JsonRpcConnection::SendMessageSync, JsonRpcConnection::Ptr(this), message), true);
+	if (!m_Stream->IsEof())
+		m_WriteQueue.Enqueue(boost::bind(&JsonRpcConnection::SendMessageSync, JsonRpcConnection::Ptr(this), message), true);
 }
 
 void JsonRpcConnection::SendMessageSync(const Dictionary::Ptr& message)
@@ -108,7 +109,7 @@ void JsonRpcConnection::SendMessageSync(const Dictionary::Ptr& message)
 		Log(LogWarning, "JsonRpcConnection")
 		    << info.str() << "\n" << DiagnosticInformation(ex);
 
-		Disconnect();
+		Utility::QueueAsyncCallback(boost::bind(&JsonRpcConnection::Disconnect, JsonRpcConnection::Ptr(this)));
 	}
 }
 
@@ -117,14 +118,16 @@ void JsonRpcConnection::Disconnect(void)
 	Log(LogWarning, "JsonRpcConnection")
 	    << "API client disconnected for identity '" << m_Identity << "'";
 
+	m_Stream->Close();
+
+	m_WriteQueue.Join();
+
 	if (m_Endpoint)
 		m_Endpoint->RemoveClient(this);
 	else {
 		ApiListener::Ptr listener = ApiListener::GetInstance();
 		listener->RemoveAnonymousClient(this);
 	}
-
-	m_Stream->Close();
 }
 
 bool JsonRpcConnection::ProcessMessage(void)