diff options
author | Andras Timar <andras.timar@collabora.com> | 2020-10-28 20:44:58 +0100 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2020-10-30 11:21:43 +0100 |
commit | f786244a0bf650a151282121b0929752b6a1ff6f (patch) | |
tree | dffdbe7626770463563cb9e6a81c0d341eb86be4 /wsd | |
parent | Make Themeing related CSS vars UI Configurable (diff) | |
download | online-f786244a0bf650a151282121b0929752b6a1ff6f.tar.gz online-f786244a0bf650a151282121b0929752b6a1ff6f.zip |
Revert "wsd: temporarily avoid race-conditions when creating documents"
This reverts commit 4410c51b3879c9291b465dea3a59c2e65e94c361.
Reason: this issue should be fixed in the integration that caused the
problem in the first place.
Change-Id: Id41eb66979e4c08dd3b9fd6499e01b4690526541
Diffstat (limited to 'wsd')
-rw-r--r-- | wsd/ClientSession.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/wsd/ClientSession.cpp b/wsd/ClientSession.cpp index e018e59b4b..eb2154f50a 100644 --- a/wsd/ClientSession.cpp +++ b/wsd/ClientSession.cpp @@ -1460,14 +1460,8 @@ bool ClientSession::handleKitToClientMessage(const char* buffer, const int lengt // Wopi post load actions if (_wopiFileInfo && !_wopiFileInfo->getTemplateSource().empty()) { - // When creating new documents from templates, a reproducible race-condition - // in at least one host results in 'file locked' error when saving the document - // within a short time from creating it. To avoid this, a small delay seems to - // be sufficient to allow enough time for the creation lock to be released. - // FIXM: remove when said race-condition is reliably fixed in the affected hosts. - sleep(2); - LOG_DBG("Saving template [" << _wopiFileInfo->getTemplateSource() << "] to storage"); std::string result; + LOG_DBG("Saving template [" << _wopiFileInfo->getTemplateSource() << "] to storage"); docBroker->saveToStorage(getId(), true, result, /*force=*/false); } |