summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
authorMatthew Newhook <matthew@zeroc.com>2005-10-27 07:52:24 +0000
committerMatthew Newhook <matthew@zeroc.com>2005-10-27 07:52:24 +0000
commit4fedcc1f6cba72946dbbd0688463aaa87b1e69ac (patch)
tree7d1b94230109412747d942f190824f984ad764b3 /cpp/src
parenthttp://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=547 (diff)
downloadice-4fedcc1f6cba72946dbbd0688463aaa87b1e69ac.tar.bz2
ice-4fedcc1f6cba72946dbbd0688463aaa87b1e69ac.tar.xz
ice-4fedcc1f6cba72946dbbd0688463aaa87b1e69ac.zip
http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=547
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/IceUtil/RWRecMutex.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/cpp/src/IceUtil/RWRecMutex.cpp b/cpp/src/IceUtil/RWRecMutex.cpp
index 414a9e079ac..631e6a10658 100644
--- a/cpp/src/IceUtil/RWRecMutex.cpp
+++ b/cpp/src/IceUtil/RWRecMutex.cpp
@@ -395,7 +395,7 @@ IceUtil::RWRecMutex::timedUpgrade(const Time& timeout) const
{
bool result = _upgrader.timedWait(lock, remainder);
--_waitingWriters;
- if(result == false)
+ if(!result)
{
_upgrading = false;
++_count;
@@ -416,6 +416,7 @@ IceUtil::RWRecMutex::timedUpgrade(const Time& timeout) const
// The lock isn't acquired if a timeout occurred.
//
++_count;
+ _upgrading = false;
return false;
}
}