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

Jan Holesovsky kendy at collabora.com
Tue Mar 14 16:44:06 UTC 2017


 wsd/LOOLWSD.cpp |    9 ---------
 1 file changed, 9 deletions(-)

New commits:
commit d71ff2240ad667c3ba5193cb7caf710591f05357
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Tue Mar 14 17:41:54 2017 +0100

    We don't expect the DocumentBroker isAlive() yet here.
    
    Change-Id: Ib0349d3764ca2f8a71f6ac355b0ebc8799ee3d43

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index fa6d629..8ae2035 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -1407,15 +1407,6 @@ static std::shared_ptr<ClientSession> createNewClientSession(const WebSocketHand
     {
         auto lock = docBroker->getLock();
 
-        // Validate the broker.
-        if (!docBroker->isAlive())
-        {
-            LOG_ERR("DocBroker is invalid or premature termination of child process.");
-            lock.unlock();
-            removeDocBrokerSession(docBroker);
-            return nullptr;
-        }
-
         if (docBroker->isMarkedToDestroy())
             LOG_WRN("DocBroker is marked to destroy, attempting to add session anyway.");
 


More information about the Libreoffice-commits mailing list