[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-0' - wsd/LOOLWSD.cpp

Ashod Nakashian ashod.nakashian at collabora.co.uk
Thu Dec 1 10:34:48 UTC 2016


 wsd/LOOLWSD.cpp |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 93025ceff17deae243dca1e19ffd21d106410854
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Wed Nov 30 20:23:14 2016 -0500

    loolwsd: alertAllUsersInternal expects lock to be taken
    
    Change-Id: I50a4d0edd500043c52c28aba3e61ba2a892c102d
    (cherry picked from commit 3c1f7b82144fe978a2fdef9cd1fbf6fcd859c9b5)
    Reviewed-on: https://gerrit.libreoffice.org/31454
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 6b143a4..f433637 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -291,6 +291,8 @@ 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");
         }
 


More information about the Libreoffice-commits mailing list