[Libreoffice-commits] online.git: wsd/DocumentBroker.cpp

Ashod Nakashian ashod.nakashian at collabora.co.uk
Thu Apr 6 06:21:46 UTC 2017


 wsd/DocumentBroker.cpp |    2 --
 1 file changed, 2 deletions(-)

New commits:
commit 5e4528b59353733cc95b29613ba74ce2b26af0c4
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Thu Apr 6 01:59:20 2017 -0400

    wsd: leave the poll running so DocBroker can flush the sockets
    
    By stopping the poll we fail to notify the clients
    of the shutdown. Let the DocBroker poll thread
    take care of the poll stopping when it's ready.
    
    Change-Id: I2cb4c76da2722ce41a60fc1983b10dc8b18b4cab
    Reviewed-on: https://gerrit.libreoffice.org/36184
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 3ab3d121..8dd3fa42 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -1325,8 +1325,6 @@ void DocumentBroker::terminateChild(const std::string& closeReason, const bool r
         _childProcess->close(rude);
     }
 
-    // Stop the polling thread.
-    _poll->stop();
     _stop = true;
 }
 


More information about the Libreoffice-commits mailing list