[Libreoffice-commits] online.git: common/Session.hpp wsd/ClientSession.hpp wsd/DocumentBroker.cpp

[Ashod Nakashian]

 common/Session.hpp     |    7 -------
 wsd/ClientSession.hpp  |   13 ++-----------
 wsd/DocumentBroker.cpp |    8 +-------
 3 files changed, 3 insertions(+), 25 deletions(-)

New commits:
commit f1c371555a686611ba0b6bd324c57e7c6e7cd353
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Sun Mar 26 23:04:27 2017 -0400

    wsd: kill unused headless stuff
    
    Change-Id: Ic4ee7603ecd7acd10e4499457de181342f2d7483
    Reviewed-on: https://gerrit.libreoffice.org/35735
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/common/Session.hpp b/common/Session.hpp
index c8f2e63b..7c337fe2 100644
--- a/common/Session.hpp
+++ b/common/Session.hpp
@@ -68,13 +68,6 @@ public:
     void closeFrame() { _isCloseFrame = true; };
     bool isCloseFrame() const { return _isCloseFrame; }
 
-    bool isHeadless() const
-    {
-        // TODO loolnb here we should return true when there is no
-        // client socket (i.e. when converting documents).
-        return false;
-    }
-
 protected:
     Session(const std::string& name, const std::string& id);
     virtual ~Session();
diff --git a/wsd/ClientSession.hpp b/wsd/ClientSession.hpp
index c027f4b3..5c505a43 100644
--- a/wsd/ClientSession.hpp
+++ b/wsd/ClientSession.hpp
@@ -70,17 +70,8 @@ public:
         // If in the correct thread - no need for wakeups.
         assert (!docBroker || docBroker->isCorrectThread());
 
-        if (isHeadless())
-        {
-            // Fail silently and return as there is no actual websocket
-            // connection in this case.
-            LOG_INF(getName() << ": Headless peer, not forwarding message [" << data->abbr() << "].");
-        }
-        else
-        {
-            LOG_TRC(getName() << " enqueueing client message " << data->id());
-            _senderQueue.enqueue(data);
-        }
+        LOG_TRC(getName() << " enqueueing client message " << data->id());
+        _senderQueue.enqueue(data);
     }
 
     bool stopping() const { return _stop || _senderQueue.stopping(); }
diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index ba3a7595..47e86ecb 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -1200,13 +1200,7 @@ bool DocumentBroker::forwardToClient(const std::shared_ptr<Message>& payload)
             // Broadcast to all.
             for (const auto& pair : _sessions)
             {
-#if 0 // loolnb
-                if (!pair.second->isHeadless() && !pair.second->isCloseFrame())
-#endif
-                if (!pair.second->isHeadless())
-                {
-                    pair.second->handleKitToClientMessage(data, size);
-                }
+                pair.second->handleKitToClientMessage(data, size);
             }
         }
         else