summaryrefslogtreecommitdiff
path: root/src/mongo/db/catalog/drop_database.cpp
diff options
context:
space:
mode:
authorDivjot Arora <divjot.arora@10gen.com>2019-03-05 16:18:32 -0500
committerDivjot Arora <divjot.arora@10gen.com>2019-03-20 19:15:21 -0400
commitf8f198e55172ba49d9ffb94be50d4e900caa1108 (patch)
treec1fe58b27303401c71af5bc323ecdc4cfac7d4b8 /src/mongo/db/catalog/drop_database.cpp
parent01d8fbb1f0373f0fcca7b2d602f1e593cdc5a379 (diff)
downloadmongo-f8f198e55172ba49d9ffb94be50d4e900caa1108.tar.gz
SERVER-39507 Transfer Collection ownership to UUIDCatalog
Diffstat (limited to 'src/mongo/db/catalog/drop_database.cpp')
-rw-r--r--src/mongo/db/catalog/drop_database.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/mongo/db/catalog/drop_database.cpp b/src/mongo/db/catalog/drop_database.cpp
index 13b8193f36c..9996f037623 100644
--- a/src/mongo/db/catalog/drop_database.cpp
+++ b/src/mongo/db/catalog/drop_database.cpp
@@ -144,7 +144,12 @@ Status dropDatabase(OperationContext* opCtx, const std::string& dbName) {
auto dropPendingGuard = makeGuard([&db, opCtx] { db->setDropPending(opCtx, false); });
std::vector<NamespaceString> collectionsToDrop;
- for (Collection* collection : *db) {
+ for (auto collIt = db->begin(opCtx); collIt != db->end(opCtx); ++collIt) {
+ auto collection = *collIt;
+ if (!collection) {
+ break;
+ }
+
const auto& nss = collection->ns();
numCollections++;