[Libreoffice-commits] online.git: wsd/ClientSession.hpp wsd/SenderQueue.hpp

[Ashod Nakashian]

 wsd/ClientSession.hpp |    1 +
 wsd/SenderQueue.hpp   |    6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit df32077005e81a1187ce750bfdf34021c5b04ca2
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Sun Jan 1 23:17:50 2017 -0500

    wsd: read message payload from correct source
    
    Change-Id: I9333b4ecb3aae7c22e93f0b92a3e6eed59bb875f
    Reviewed-on: https://gerrit.libreoffice.org/32600
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/wsd/ClientSession.hpp b/wsd/ClientSession.hpp
index 2786e8f..7952029 100644
--- a/wsd/ClientSession.hpp
+++ b/wsd/ClientSession.hpp
@@ -63,6 +63,7 @@ public:
 
     void enqueueSendMessage(const std::shared_ptr<MessagePayload>& data)
     {
+        LOG_TRC(getName() << " enqueueing client message: " << data->abbreviation());
         _senderQueue.enqueue(data);
     }
 
diff --git a/wsd/SenderQueue.hpp b/wsd/SenderQueue.hpp
index 6083c19..900dd94 100644
--- a/wsd/SenderQueue.hpp
+++ b/wsd/SenderQueue.hpp
@@ -52,9 +52,9 @@ public:
                    const enum Type type,
                    const size_t reserve) :
         _data(std::max(reserve, message.size())),
-        _tokens(LOOLProtocol::tokenize(_data.data(), _data.size())),
-        _firstLine(LOOLProtocol::getFirstLine(_data.data(), _data.size())),
-        _abbreviation(LOOLProtocol::getAbbreviatedMessage(_data.data(), _data.size())),
+        _tokens(LOOLProtocol::tokenize(message)),
+        _firstLine(LOOLProtocol::getFirstLine(message)),
+        _abbreviation(LOOLProtocol::getAbbreviatedMessage(message)),
         _type(type)
     {
         _data.resize(message.size());