[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - wsd/DocumentBroker.cpp

[Mike Kaganski (via logerrit)]

 wsd/DocumentBroker.cpp |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 2149f25323405ce3ce89d4e3f6af9453f4f4694f
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Wed Jul 1 13:38:06 2020 +0300
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Jul 6 06:36:28 2020 +0200

    Only lock documents in editing sessions
    
    Change-Id: I97753541a944bb299b04c032790d6af7a9ee0f63
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97609
    Tested-by: Jenkins
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
    (cherry picked from commit 35f8788e1cae3d94ae9a39074aca83dddaea43d3)
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97683
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 5e647ec76..2c0ec41c2 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -785,7 +785,9 @@ bool DocumentBroker::load(const std::shared_ptr<ClientSession>& session, const s
         std::string localPath = _storage->loadStorageFileToLocal(
             session->getAuthorization(), session->getCookies(), *_lockCtx, templateSource);
 
-        if (!_storage->updateLockState(session->getAuthorization(), session->getCookies(), *_lockCtx, true))
+        // Only lock the document on storage for editing sessions
+        if (!session->isReadOnly() &&
+            !_storage->updateLockState(session->getAuthorization(), session->getCookies(), *_lockCtx, true))
             LOG_ERR("Failed to lock!");
 
 #if !MOBILEAPP