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

[Ashod Nakashian]

 loolwsd/LOOLWSD.cpp              |    2 ++
 loolwsd/MasterProcessSession.cpp |    3 ---
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 38c4acd5f0ec6e96458e86ddb357e12177dd8dd0
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Sat Mar 12 20:39:34 2016 -0500

    loolwsd: moved document loading outside of MasterProcessSession
    
    Change-Id: I8ecce82abcae6d0f07b86c188c91913ff9ca115a
    Reviewed-on: https://gerrit.libreoffice.org/23219
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 28b1a8e..1d63532 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -681,6 +681,8 @@ public:
                 }
             }
 
+            docBroker->load(jailId);
+
             auto ws = std::make_shared<WebSocket>(request, response);
             auto session = std::make_shared<MasterProcessSession>(sessionId, LOOLSession::Kind::ToPrisoner, ws, docBroker);
 
diff --git a/loolwsd/MasterProcessSession.cpp b/loolwsd/MasterProcessSession.cpp
index bdb730f..d78a762 100644
--- a/loolwsd/MasterProcessSession.cpp
+++ b/loolwsd/MasterProcessSession.cpp
@@ -801,9 +801,6 @@ void MasterProcessSession::dispatchChild()
         return;
     }
 
-    const auto jailRoot = Poco::Path(LOOLWSD::ChildRoot, childSession->_childId);
-    _docBroker->load(childSession->_childId);
-
     _peer = childSession;
     childSession->_peer = shared_from_this();
     childSession->_docBroker = _docBroker;