[Libreoffice-commits] online.git: kit/Kit.cpp

[Ashod Nakashian (via logerrit)]

 kit/Kit.cpp |   17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

New commits:
commit 4619ac73ffb31ce7f3bb30accb5a5be116529bff
Author:     Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Wed Jan 8 03:37:47 2020 -0500
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Tue Jan 14 13:01:05 2020 +0100

    wsd: minor cleanup
    
    Change-Id: I2c062e1f7d309c8d1c54e6d0e8ca4c40f288d09d
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/86723
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index a8855f1c3..78eea14eb 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -1854,27 +1854,22 @@ private:
     }
 
 public:
-    bool hasQueued()
-    {
-        return !_tileQueue->isEmpty();
-    }
-
     void drainQueue(const std::chrono::steady_clock::time_point &now)
     {
         try
         {
-            while (hasQueued())
+            while (!_tileQueue->isEmpty())
             {
-                const TileQueue::Payload input = _tileQueue->pop();
-
-                LOG_TRC("Kit Recv " << LOOLProtocol::getAbbreviatedMessage(input));
-
                 if (_stop || SigUtil::getTerminationFlag())
                 {
-                    LOG_INF("_stop or TerminationFlag is set, breaking out of loop");
+                    LOG_INF("_stop or TerminationFlag is set, breaking Document::drainQueue of loop");
                     break;
                 }
 
+                const TileQueue::Payload input = _tileQueue->pop();
+
+                LOG_TRC("Kit Recv " << LOOLProtocol::getAbbreviatedMessage(input));
+
                 const std::vector<std::string> tokens = LOOLProtocol::tokenize(input.data(), input.size());
 
                 if (tokens[0] == "eof")