diff options
| author | Andy Schwerin <schwerin@mongodb.com> | 2015-03-12 13:30:13 -0400 |
|---|---|---|
| committer | Ramon Fernandez <ramon.fernandez@mongodb.com> | 2015-06-25 16:32:31 -0400 |
| commit | 51931719c69347e36bc4d40b24693559795c9006 (patch) | |
| tree | 91c879ad875bcca1f63b77a63c5d7e585e680c64 | |
| parent | 4fd4ba8c325a673e321edab73e75355e1d5f8e8a (diff) | |
| download | mongo-51931719c69347e36bc4d40b24693559795c9006.tar.gz | |
SERVER-17568 Correctly acquire _mutex in CountdownLatchHolder::get in v8_utils.cpp
(cherry picked from commit 3bb26d2bb96b65177019fb78297a94d50e4acc67)
| -rw-r--r-- | src/mongo/scripting/v8-3.25_utils.cpp | 2 | ||||
| -rw-r--r-- | src/mongo/scripting/v8_utils.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mongo/scripting/v8-3.25_utils.cpp b/src/mongo/scripting/v8-3.25_utils.cpp index 566f1b3b879..89ce41395e7 100644 --- a/src/mongo/scripting/v8-3.25_utils.cpp +++ b/src/mongo/scripting/v8-3.25_utils.cpp @@ -255,7 +255,7 @@ namespace mongo { }; boost::shared_ptr<Latch> get(int32_t desc) { - boost::lock_guard<boost::mutex> lock(mutex); + boost::lock_guard<boost::mutex> lock(_mutex); Map::iterator iter = _latches.find(desc); jsassert(iter != _latches.end(), "not a valid CountDownLatch descriptor"); return iter->second; diff --git a/src/mongo/scripting/v8_utils.cpp b/src/mongo/scripting/v8_utils.cpp index 098d04e8123..2c5cd66f996 100644 --- a/src/mongo/scripting/v8_utils.cpp +++ b/src/mongo/scripting/v8_utils.cpp @@ -252,7 +252,7 @@ namespace mongo { }; boost::shared_ptr<Latch> get(int32_t desc) { - boost::lock_guard<boost::mutex> lock(mutex); + boost::lock_guard<boost::mutex> lock(_mutex); Map::iterator iter = _latches.find(desc); jsassert(iter != _latches.end(), "not a valid CountDownLatch descriptor"); return iter->second; |