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

Ashod Nakashian ashod.nakashian at collabora.co.uk
Thu Oct 6 05:58:29 UTC 2016


 loolwsd/LOOLKit.cpp |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 5b3e5f73a2e9a0cc65821d0f4324782b622ed2f7
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Thu Oct 6 01:52:14 2016 -0400

    loolwsd: trade view creation and assert lock ownership
    
    Change-Id: Ib593bec4d6e6b810d5f6cfb4bdf7d3f1212709b4
    Reviewed-on: https://gerrit.libreoffice.org/29549
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/loolwsd/LOOLKit.cpp b/loolwsd/LOOLKit.cpp
index d2cfdb5..9f5ba59 100644
--- a/loolwsd/LOOLKit.cpp
+++ b/loolwsd/LOOLKit.cpp
@@ -1179,8 +1179,11 @@ private:
 
             Log::info("Loading view to document from URI: [" + uri + "] for session [" + sessionId + "].");
             _loKitDocument->createView();
+            Log::trace("View created.");
         }
 
+        Util::assertIsLocked(lockLokDoc);
+
         Object::Ptr renderOptsObj = new Object();
 
         // Fill the object with renderoptions, if any


More information about the Libreoffice-commits mailing list