diff options
| author | Spencer T Brody <spencer@mongodb.com> | 2015-05-29 18:14:03 -0400 |
|---|---|---|
| committer | Spencer T Brody <spencer@mongodb.com> | 2015-05-29 18:14:03 -0400 |
| commit | 993fc5e4ed9264965f16a948d3732d3fc55d1255 (patch) | |
| tree | d5288061d1d0e10bc499e37d728c40ce83bcb06f /src/mongo/db/commands | |
| parent | e181ea38af737ef7aaf5f8228f870d8c7149b2bb (diff) | |
| download | mongo-993fc5e4ed9264965f16a948d3732d3fc55d1255.tar.gz | |
Revert "SERVER-18277 Clarify locking of Client when accessing its stored OperationContext."
This reverts commit 5c2d133871b2ad2adf6c617364d036ca25261f2d.
Diffstat (limited to 'src/mongo/db/commands')
| -rw-r--r-- | src/mongo/db/commands/current_op.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mongo/db/commands/current_op.cpp b/src/mongo/db/commands/current_op.cpp index 402558814df..7d3957ea42f 100644 --- a/src/mongo/db/commands/current_op.cpp +++ b/src/mongo/db/commands/current_op.cpp @@ -106,7 +106,7 @@ namespace mongo { invariant(client); - stdx::lock_guard<Client> lk(*client); + boost::unique_lock<Client> uniqueLock(*client); const OperationContext* opCtx = client->getOperationContext(); if (!includeAll) { @@ -132,7 +132,7 @@ namespace mongo { // LockState Locker::LockerInfo lockerInfo; - opCtx->lockState()->getLockerInfo(&lockerInfo); + client->getOperationContext()->lockState()->getLockerInfo(&lockerInfo); fillLockerInfo(lockerInfo, infoBuilder); } else { |