diff options
| author | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2014-10-30 13:54:49 -0400 |
|---|---|---|
| committer | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2014-10-30 16:40:53 -0400 |
| commit | 2008dfd2239f342e0766b60ba7ec65cefdd83cce (patch) | |
| tree | 2d41e01df2f36e859eddbde8059373cc42a55a6d /src/mongo/db/client.h | |
| parent | c32714fbbb8f818ad01abb2cf84530dff3dbc94c (diff) | |
| download | mongo-2008dfd2239f342e0766b60ba7ec65cefdd83cce.tar.gz | |
SERVER-15880 AutoGetCollectionForRead should always free its collection lock
Diffstat (limited to 'src/mongo/db/client.h')
| -rw-r--r-- | src/mongo/db/client.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mongo/db/client.h b/src/mongo/db/client.h index cfbaa38cab8..033c6049577 100644 --- a/src/mongo/db/client.h +++ b/src/mongo/db/client.h @@ -257,7 +257,7 @@ namespace mongo { ~AutoGetCollectionForRead(); Database* getDb() const { - return _db; + return _db.getDb(); } Collection* getCollection() const { @@ -270,9 +270,9 @@ namespace mongo { const Timer _timer; OperationContext* const _txn; const NamespaceString _nss; - const Lock::DBLock _dbLock; + const AutoGetDb _db; + const Lock::CollectionLock _collLock; - Database* _db; Collection* _coll; }; |