diff options
| author | Geert Bosch <geert@mongodb.com> | 2015-06-08 11:31:57 -0400 |
|---|---|---|
| committer | Geert Bosch <geert@mongodb.com> | 2015-07-13 09:48:34 -0400 |
| commit | 8d49054385b3715c8459e3a7bcb14bb1945710db (patch) | |
| tree | de28f64998f730b66d116c8245c64ca4eb0396a1 | |
| parent | 7f4761bab01d588f41016500eedac9c764b8078f (diff) | |
| download | mongo-8d49054385b3715c8459e3a7bcb14bb1945710db.tar.gz | |
SERVER-17259: Handle disappearance of collection during M/R
(cherry-picked from 7a037260a8118aeaf5ff73a9f7ba01e633589bac)
Conflicts:
src/mongo/db/commands/mr.cpp
| -rw-r--r-- | src/mongo/db/commands/mr.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mongo/db/commands/mr.cpp b/src/mongo/db/commands/mr.cpp index 057dfb1b5b4..f2be6826a74 100644 --- a/src/mongo/db/commands/mr.cpp +++ b/src/mongo/db/commands/mr.cpp @@ -639,8 +639,8 @@ namespace mongo { bool found; { Client::Context tx(txn, _config.outputOptions.finalNamespace); - Collection* coll = - tx.db()->getCollection(_config.outputOptions.finalNamespace); + const std::string& finalNamespace = _config.outputOptions.finalNamespace; + Collection* coll = getCollectionOrUassert(tx.db(), finalNamespace); found = Helpers::findOne(_txn, coll, temp["_id"].wrap(), |