Revert "Fix another deadlock in ApiClient::SendMessage"

This reverts commit a0c09303251d22738f82a9c35a66d327c98699a3.

diff --git a/lib/remote/apiclient.cpp b/lib/remote/apiclient.cpp
index f48a9873c500cd03a9f395f61e14e1aef3a5dc32..9203094f102b7517927e2dc318934056fad0fa70 100644 (file)
--- a/lib/remote/apiclient.cpp
+++ b/lib/remote/apiclient.cpp
@@ -67,7 +67,7 @@ ConnectionRole ApiClient::GetRole(void) const
 void ApiClient::SendMessage(const Dictionary::Ptr& message)
 {
        try {
-               boost::mutex::scoped_lock lock(m_WriteMutex);
+               ObjectLock olock(m_Stream);
                JsonRpc::SendMessage(m_Stream, message);
                if (message->Get("method") != "log::SetLogPosition")
                        m_Seen = Utility::GetTime();

diff --git a/lib/remote/apiclient.hpp b/lib/remote/apiclient.hpp
index 666262eaaf7c2576ac409de149fef3f5ed1b72d6..b491708c0fcc9f8f71157327b63d503812f2b1b9 100644 (file)
--- a/lib/remote/apiclient.hpp
+++ b/lib/remote/apiclient.hpp
@@ -58,7 +58,6 @@ public:
        void SendMessage(const Dictionary::Ptr& request);
 
 private:
-       boost::mutex m_WriteMutex;
        String m_Identity;
        Endpoint::Ptr m_Endpoint;
        Stream::Ptr m_Stream;