[Libreoffice-commits] online.git: loolwsd/LOOLKit.cpp

Pranav Kant pranavk at collabora.co.uk
Wed Oct 26 14:46:29 UTC 2016


 loolwsd/LOOLKit.cpp |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 1f14642f8c1197ceb65a62c730326a61e23e5284
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Wed Oct 26 20:11:52 2016 +0530

    loolwsd: This is sessionId, not viewId
    
    Change-Id: I98026369602fe6e25f72fe743e4f67b821ef0418

diff --git a/loolwsd/LOOLKit.cpp b/loolwsd/LOOLKit.cpp
index b88126a..07f2d25 100644
--- a/loolwsd/LOOLKit.cpp
+++ b/loolwsd/LOOLKit.cpp
@@ -1123,15 +1123,15 @@ private:
         Log::trace("Forwarding payload to " + prefix + ' ' + message);
 
         std::string name;
-        std::string viewId;
-        if (LOOLProtocol::parseNameValuePair(prefix, name, viewId, '-') && name == "child")
+        std::string sessionId;
+        if (LOOLProtocol::parseNameValuePair(prefix, name, sessionId, '-') && name == "child")
         {
-            const auto it = _sessions.find(viewId);
+            const auto it = _sessions.find(sessionId);
             if (it != _sessions.end())
             {
                 if (message == "disconnect")
                 {
-                    Log::debug("Removing ChildSession " + viewId);
+                    Log::debug("Removing ChildSession " + sessionId);
                     _oldSessionIds[it->second->getViewId()] = it->second->getViewUserName();
                     _sessions.erase(it);
                     return true;
@@ -1144,7 +1144,7 @@ private:
                 }
             }
 
-            Log::warn() << "Child session [" << viewId << "] not found to forward message: " << message << Log::end;
+            Log::warn() << "Child session [" << sessionId << "] not found to forward message: " << message << Log::end;
         }
         else
         {


More information about the Libreoffice-commits mailing list