summaryrefslogtreecommitdiff
path: root/src/mongo/db/catalog/drop_collection.cpp
diff options
context:
space:
mode:
authormatt dannenberg <matt.dannenberg@10gen.com>2015-05-13 12:15:01 -0400
committermatt dannenberg <matt.dannenberg@10gen.com>2015-05-15 05:25:14 -0400
commit6d88e820506ee85368eb703c176835a0595693b5 (patch)
tree17472c2a42ce8cb1739677247fd192129d0bf7a7 /src/mongo/db/catalog/drop_collection.cpp
parent280fbae9044af29bc63068dbe9c4e7846e9e6517 (diff)
downloadmongo-6d88e820506ee85368eb703c176835a0595693b5.tar.gz
SERVER-18420 fix double populating of result in dropCollection
Diffstat (limited to 'src/mongo/db/catalog/drop_collection.cpp')
-rw-r--r--src/mongo/db/catalog/drop_collection.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mongo/db/catalog/drop_collection.cpp b/src/mongo/db/catalog/drop_collection.cpp
index bf58462449f..3fb248ecb79 100644
--- a/src/mongo/db/catalog/drop_collection.cpp
+++ b/src/mongo/db/catalog/drop_collection.cpp
@@ -93,15 +93,17 @@ namespace {
stopIndexBuilds(txn, db, collectionName);
- result.append("ns", collectionName);
- result.append("nIndexesWas", numIndexes);
WriteUnitOfWork wunit(txn);
Status s = db->dropCollection(txn, collectionName.ns());
+ result.append("ns", collectionName);
+
if ( !s.isOK() ) {
return s;
}
+ result.append("nIndexesWas", numIndexes);
+
wunit.commit();
} MONGO_WRITE_CONFLICT_RETRY_LOOP_END(txn, "drop", collectionName.ns());
return Status::OK();