wsd/LOOLWSD.cpp | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
New commits:
commit 6023fdc3c70a2d2aad2c98c8e739f19d7a630e8b
Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk>
Date: Sun Apr 16 23:47:46 2017 -0400
wsd: take DocBrokers lock before broadcasting diskfull
Change-Id: I4f7cccb1112c17091d1039441af4c84d5d13d059
Reviewed-on: https://gerrit.libreoffice.org/36601
Reviewed-by: Ashod Nakashian <ashnak...@gmail.com>
Tested-by: Ashod Nakashian <ashnak...@gmail.com>
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index e3619b6e..21b046e5 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -209,7 +209,7 @@ inline void shutdownLimitReached(WebSocketHandler& ws)
/// connected to any document.
void alertAllUsersInternal(const std::string& msg)
{
- Util::assertIsLocked(DocBrokersMutex);
+ std::lock_guard<std::mutex> docBrokersLock(DocBrokersMutex);
LOG_INF("Alerting all users: [" << msg << "]");
@@ -2574,8 +2574,6 @@ void alertAllUsers(const std::string& cmd, const
std::string& kind)
void alertAllUsers(const std::string& msg)
{
- std::lock_guard<std::mutex> docBrokersLock(DocBrokersMutex);
-
alertAllUsersInternal(msg);
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
