strepsirrhini/libreoffice-online
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

wsd: remove DocBroker from Admin last

Browse source 
Change-Id: Ia77b8ce5aacb9ac1dadd1251f78e40da953e7b92
Signed-off-by: Ashod Nakashian <ashod.nakashian@collabora.co.uk>
(cherry picked from commit caf5ac9c23a612836185475f4efc4c9c0249e3b4)
This commit is contained in:
Ashod Nakashian 2021-12-17 02:04:32 -05:00 committed by Jan Holesovsky
parent de74eae245
commit 77d5816cfc
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
wsd/DocumentBroker.cpp
View file

@ -517,10 +517,6 @@ DocumentBroker::~DocumentBroker()
{
assertCorrectThread();
#if !MOBILEAPP
Admin::instance().rmDoc(_docKey);
#endif
LOG_INF("~DocumentBroker [" << _docKey <<
"] destroyed with " << _sessions.size() << " sessions left.");
@ -528,11 +524,16 @@ DocumentBroker::~DocumentBroker()
_poll->joinThread();
if (!_sessions.empty())
LOG_WRN("DocumentBroker [" << _docKey << "] still has unremoved sessions.");
LOG_WRN("Destroying DocumentBroker [" << _docKey << "] while having unremoved sessions.");
// Need to first make sure the child exited, socket closed,
// and thread finished before we are destroyed.
_childProcess.reset();
#if !MOBILEAPP
// Remove from the admin last, to avoid racing the next test.
Admin::instance().rmDoc(_docKey);
#endif
}
void DocumentBroker::joinThread()