wsd/DocumentBroker.hpp | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)
New commits:
commit faee2bdb24bcc77b879e5b9329889209c113f4a1
Author: Michael Meeks <michael.me...@collabora.com>
AuthorDate: Thu Feb 13 00:23:43 2020 +0000
Commit: Michael Meeks <michael.me...@collabora.com>
CommitDate: Thu Feb 13 00:33:05 2020 +0000
Revert "Fix removal of kit procs when they are blocked"
This reverts commit 3046c5748bb54b16738aa5a7ee5e90b9420d68ac.
This breaks mobile apps for now. Apparently the 'close'
forces a different ordering than expected on the Child.
diff --git a/wsd/DocumentBroker.hpp b/wsd/DocumentBroker.hpp
index 8b2b42551..890e89e38 100644
--- a/wsd/DocumentBroker.hpp
+++ b/wsd/DocumentBroker.hpp
@@ -119,23 +119,14 @@ public:
// Shutdown the socket.
if (_ws)
- {
_ws->shutdown();
- // If socket was shutdown and buffers cleared then there's no
- // reason to keep the object. This is crucial for
DocumentBroker
- // to be considered as not alive and associated kit process
- // terminated in cleanupDocBrokers. Otherwise if kit process
- // hangs then the asociated DocumentBroker object won't be
- // removed and kit process won't be forcefully terminated. This
- // is in conjunction with not clearing _pid data member which
- // is needed later in call to terminate().
- _ws.reset();
- }
}
catch (const std::exception& ex)
{
LOG_ERR("Error while closing child process: " << ex.what());
}
+
+ _pid = -1;
}
/// Kill or abandon the child.
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
