[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - wsd/LOOLWSD.cpp

[Ashod Nakashian]

 wsd/LOOLWSD.cpp |   18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

New commits:
commit f411100a522040e8826f599e66f1f9a2c38d2dda
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Sun Apr 9 18:27:25 2017 -0400

    wsd: remove outdated comment and simplify
    
    Change-Id: I47e8b22708ab64ad95aa681407344686e6d4eb9d
    Reviewed-on: https://gerrit.libreoffice.org/36325
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>
    (cherry picked from commit bc41ad9bf96722b9ec2654f4e54a052f5b56d52e)
    Reviewed-on: https://gerrit.libreoffice.org/36339
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 0f91598e..aa00d0ba 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -1475,28 +1475,20 @@ private:
         if (UnitWSD::get().filterChildMessage(data))
             return;
 
+        const std::string abbr = getAbbreviatedMessage(data);
         auto socket = _socket.lock();
         if (socket)
-            LOG_TRC("#" << socket->getFD() << " Prisoner message [" << getAbbreviatedMessage(&data[0], data.size()) << "].");
+            LOG_TRC("#" << socket->getFD() << " Prisoner message [" << abbr << "].");
         else
             LOG_WRN("Message handler called but without valid socket.");
 
         auto child = _childProcess.lock();
         auto docBroker = child ? child->getDocumentBroker() : nullptr;
         if (docBroker)
-        {
-            // We should never destroy the broker, since
-            // it owns us and will wait on this thread.
-            // This is true with non-blocking since this is
-            // called from DocumentBroker::pollThread.
-            assert(docBroker.use_count() > 1);
             docBroker->handleInput(data);
-            return;
-        }
-
-        LOG_WRN("Child " << child->getPid() <<
-                " has no DocumentBroker to handle message: [" <<
-                LOOLProtocol::getAbbreviatedMessage(data) << "].");
+        else
+            LOG_WRN("Child " << child->getPid() <<
+                    " has no DocumentBroker to handle message: [" << abbr << "].");
     }
 
     int getPollEvents(std::chrono::steady_clock::time_point /* now */,