[Libreoffice-commits] online.git: loolwsd/Admin.cpp

[Pranav Kant]

 loolwsd/Admin.cpp |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit e7f75a3e5698e06f2c1002b7eb3fb911f01b2bee
Author: Pranav Kant <pranavk at collabora.com>
Date:   Tue Mar 8 14:14:08 2016 +0530

    loolwsd: Wait for all admin client threads to finish
    
    Otherwise the process could terminate while admin sessions are still
    being served.
    
    Change-Id: Id91d0989e264e8294827e8e2ad8dd2d44b6006ec
    Reviewed-on: https://gerrit.libreoffice.org/23021
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/loolwsd/Admin.cpp b/loolwsd/Admin.cpp
index 0f5937c..5097d4f 100644
--- a/loolwsd/Admin.cpp
+++ b/loolwsd/Admin.cpp
@@ -255,6 +255,7 @@ void Admin::run()
     Util::pollPipeForReading(pollPipeNotify, FIFO_NOTIFY, NotifyPipe,
                             [this](std::string& message) { return handleInput(message); } );
 
+    _srv.stopAll();
     Log::debug("Thread [" + thread_name + "] finished.");
 }