From b82dc6bc6784a1f80574d02159d2a3576833d5e4 Mon Sep 17 00:00:00 2001 From: Jakob Ackermann Date: Fri, 19 Nov 2021 14:12:17 +0100 Subject: [PATCH] Merge pull request #5819 from overleaf/jpa-chat-race [chat] fix race condition of concurrent delete operations GitOrigin-RevId: 149c5121791af54cd6c27c3458d81641fb522b3d --- services/chat/app/js/Features/Threads/ThreadManager.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/services/chat/app/js/Features/Threads/ThreadManager.js b/services/chat/app/js/Features/Threads/ThreadManager.js index 4a62f4836d..f1cf24bcfa 100644 --- a/services/chat/app/js/Features/Threads/ThreadManager.js +++ b/services/chat/app/js/Features/Threads/ThreadManager.js @@ -47,15 +47,15 @@ module.exports = ThreadManager = { } } - db.rooms.updateOne( + db.rooms.findOneAndUpdate( query, { $set: update }, - { upsert: true }, - function (error) { + { upsert: true, returnDocument: 'after' }, + function (error, result) { if (error != null) { return callback(error) } - db.rooms.findOne(query, callback) + callback(null, result.value) } ) },