[Libreoffice-commits] online.git: wsd/AdminModel.cpp

[Miklos Vajna (via logerrit)]

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

New commits:
commit 6bdcca933d7acfc992a40948f8b5afc5c57f61dc
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Mon May 4 09:26:05 2020 +0200
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Mon May 4 09:43:42 2020 +0200

    AdminModel::removeDocument: hold a copy of doc key before erase
    
    Change-Id: I3713976b980897c6eb3e1d9e95476c5ff3dbbba1
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93398
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/wsd/AdminModel.cpp b/wsd/AdminModel.cpp
index e88b7aeab..dca1c7bc0 100644
--- a/wsd/AdminModel.cpp
+++ b/wsd/AdminModel.cpp
@@ -564,8 +564,9 @@ void AdminModel::removeDocument(const std::string& docKey, const std::string& se
         {
             std::unique_ptr<Document> doc;
             std::swap(doc, docIt->second);
+            std::string docItKey = docIt->first;
             _documents.erase(docIt);
-            _expiredDocuments.emplace(docIt->first + std::to_string(std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::steady_clock::now().time_since_epoch()).count()), std::move(doc));
+            _expiredDocuments.emplace(docItKey + std::to_string(std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::steady_clock::now().time_since_epoch()).count()), std::move(doc));
         }
     }
 }