From c1892a2f30452781bcd92135b90206ff4e48d5a5 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Wed, 30 Sep 2015 16:38:56 +0200 Subject: [PATCH] Remove JsonRpcConnection::m_WriteQueue refs #9976 --- lib/remote/jsonrpcconnection.cpp | 8 -------- lib/remote/jsonrpcconnection.hpp | 3 --- 2 files changed, 11 deletions(-) diff --git a/lib/remote/jsonrpcconnection.cpp b/lib/remote/jsonrpcconnection.cpp index ed5065113..19471d10c 100644 --- a/lib/remote/jsonrpcconnection.cpp +++ b/lib/remote/jsonrpcconnection.cpp @@ -91,12 +91,6 @@ ConnectionRole JsonRpcConnection::GetRole(void) const } void JsonRpcConnection::SendMessage(const Dictionary::Ptr& message) -{ - if (!m_Stream->IsEof()) - m_WriteQueue.Enqueue(boost::bind(&JsonRpcConnection::SendMessageSync, JsonRpcConnection::Ptr(this), message), true); -} - -void JsonRpcConnection::SendMessageSync(const Dictionary::Ptr& message) { try { ObjectLock olock(m_Stream); @@ -120,8 +114,6 @@ void JsonRpcConnection::Disconnect(void) m_Stream->Close(); - m_WriteQueue.Join(); - if (m_Endpoint) m_Endpoint->RemoveClient(this); else { diff --git a/lib/remote/jsonrpcconnection.hpp b/lib/remote/jsonrpcconnection.hpp index 42b0aee5d..6017e32b0 100644 --- a/lib/remote/jsonrpcconnection.hpp +++ b/lib/remote/jsonrpcconnection.hpp @@ -83,11 +83,8 @@ private: StreamReadContext m_Context; - WorkQueue m_WriteQueue; - bool ProcessMessage(void); void DataAvailableHandler(void); - void SendMessageSync(const Dictionary::Ptr& request); static void StaticInitialize(void); static void TimeoutTimerHandler(void); -- 2.40.0