Fix a potential deadlock in ApiClient::Disconnect

refs #6724

diff --git a/lib/remote/apiclient.cpp b/lib/remote/apiclient.cpp
index 3c6cea81e221d7921edc06e2f52a754219291fdb..813ed0b0dea0014818a0933becd5b728ec0ca1ce 100644 (file)
--- a/lib/remote/apiclient.cpp
+++ b/lib/remote/apiclient.cpp
@@ -94,6 +94,11 @@ void ApiClient::SendMessageSync(const Dictionary::Ptr& message)
 }
 
 void ApiClient::Disconnect(void)
+{
+       Utility::QueueAsyncCallback(boost::bind(&ApiClient::DisconnectSync, this));
+}
+
+void ApiClient::DisconnectSync(void)
 {
        Log(LogWarning, "ApiClient", "API client disconnected for identity '" + m_Identity + "'");
 

diff --git a/lib/remote/apiclient.hpp b/lib/remote/apiclient.hpp
index b6d87e068856f4f1d745e6fe679303f43b34143f..6f1f68074799739c97599fc127566fa3a848f615 100644 (file)
--- a/lib/remote/apiclient.hpp
+++ b/lib/remote/apiclient.hpp
@@ -55,6 +55,7 @@ public:
        ConnectionRole GetRole(void) const;
 
        void Disconnect(void);
+       void DisconnectSync(void);
 
        void SendMessage(const Dictionary::Ptr& request);