wsd/LOOLWSD.cpp | 2 --
1 file changed, 2 deletions(-)
New commits:
commit e277935b1e40ef5cf5f9be3a7599c1471b845495
Author: Jan Holesovsky <ke...@collabora.com>
Date: Thu Dec 1 12:32:26 2016 +0100
Revert "loolwsd: alertAllUsersInternal expects lock to be taken"
Unfortunately this brings back the deadlock that
51c88c5fb79c5db146a08f5ef2d9a4fe6d095caa fixed :-(
This reverts commit da3b1b208aefc734c856492db1078e1804702b4e.
Change-Id: If48c0b3ddebf3fb366786d90cb35c3c22963b1a1
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 860e7a3..3e56c67 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -291,8 +291,6 @@ static void forkChildren(const int number)
if (!fs.empty())
{
LOG_WRN("File system of " << fs << " dangerously low on disk
space");
-
- std::unique_lock<std::mutex> DocBrokersLock(DocBrokersMutex);
alertAllUsersInternal("error: cmd=internal kind=diskfull");
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
