diff options
| author | Greg Studer <greg@10gen.com> | 2013-02-26 16:25:07 -0500 |
|---|---|---|
| committer | Greg Studer <greg@10gen.com> | 2013-02-27 17:13:24 -0500 |
| commit | 2dc724253a8befc714d45a63ea86385d48abc35c (patch) | |
| tree | ff001087660eec25c3b8cdae85c4972e9c1589bc /src/mongo/client | |
| parent | e57f5d32d93cd23971cadfcdb93a4b9f07a0ef5a (diff) | |
| download | mongo-2dc724253a8befc714d45a63ea86385d48abc35c.tar.gz | |
SERVER-8710 better forcing behavior for upgrade and namespace locks during config upgrade process
Diffstat (limited to 'src/mongo/client')
| -rw-r--r-- | src/mongo/client/distlock.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/mongo/client/distlock.cpp b/src/mongo/client/distlock.cpp index d7682a85c08..d1fff0c1124 100644 --- a/src/mongo/client/distlock.cpp +++ b/src/mongo/client/distlock.cpp @@ -1047,9 +1047,8 @@ namespace mongo { } bool ScopedDistributedLock::tryAcquire(string* errMsg) { - bool acquired = false; try { - acquired = _lock.lock_try(_why, false, &_other); + _acquired = _lock.lock_try(_why, false, &_other); } catch (const DBException& e) { @@ -1059,7 +1058,7 @@ namespace mongo { return false; } - return acquired; + return _acquired; } void ScopedDistributedLock::unlock() { |