HttpServerConnection#DataAvailableHandler(): be aware of being called multiple times...

refs #6816

diff --git a/lib/remote/httpserverconnection.cpp b/lib/remote/httpserverconnection.cpp
index cd3e542f27761d16d1ff34406d4f2d9103b46658..c0550bfaeafa2a58d892a34b495dfe31f8eea770 100644 (file)
--- a/lib/remote/httpserverconnection.cpp
+++ b/lib/remote/httpserverconnection.cpp
@@ -351,7 +351,11 @@ void HttpServerConnection::DataAvailableHandler()
        bool close = false;
 
        if (!m_Stream->IsEof()) {
-               boost::recursive_mutex::scoped_lock lock(m_DataHandlerMutex);
+               boost::recursive_mutex::scoped_try_lock lock(m_DataHandlerMutex);
+               if (!lock.owns_lock()) {
+                       Log(LogInformation, "HttpServerConnection", "Unable to process available data, they're already being processed in another thread");
+                       return;
+               }
 
                try {
                        while (ProcessMessage())