NO-JIRA: tweak code to allow better lock analysis by Coverity

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1498926 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 5 insertions, 5 deletions

diff --git a/qpid/cpp/include/qpid/sys/Mutex.h b/qpid/cpp/include/qpid/sys/Mutex.h
index 43a83d4fc3..e718586a39 100644
--- a/qpid/cpp/include/qpid/sys/Mutex.h
+++ b/qpid/cpp/include/qpid/sys/Mutex.h
@@ -30,7 +30,7 @@ template <class L>
 class ScopedLock
 {
   public:
-    ScopedLock(L& l) : mutex(l) { l.lock(); }
+    ScopedLock(L& l) : mutex(l) { mutex.lock(); }
     ~ScopedLock() { mutex.unlock(); }
   private:
     L& mutex;
@@ -40,7 +40,7 @@ template <class L>
 class ScopedUnlock
 {
   public:
-    ScopedUnlock(L& l) : mutex(l) { l.unlock(); }
+    ScopedUnlock(L& l) : mutex(l) { mutex.unlock(); }
     ~ScopedUnlock() { mutex.lock(); }
   private:
     L& mutex;
@@ -50,7 +50,7 @@ template <class L>
 class ScopedRlock
 {
   public:
-    ScopedRlock(L& l) : mutex(l) { l.rlock(); }
+    ScopedRlock(L& l) : mutex(l) { mutex.rlock(); }
     ~ScopedRlock() { mutex.unlock(); }
   private:
     L& mutex;
@@ -60,7 +60,7 @@ template <class L>
 class ScopedWlock
 {
   public:
-    ScopedWlock(L& l) : mutex(l) { l.wlock(); }
+    ScopedWlock(L& l) : mutex(l) { mutex.wlock(); }
     ~ScopedWlock() { mutex.unlock(); }
   private:
     L& mutex;
@@ -70,7 +70,7 @@ template <class L>
 class ConditionalScopedLock
 {
   public:
-    ConditionalScopedLock(L& l) : mutex(l) { acquired = l.trylock(); }
+    ConditionalScopedLock(L& l) : mutex(l) { acquired = mutex.trylock(); }
     ~ConditionalScopedLock() { if (acquired) mutex.unlock(); }
     bool lockAcquired() { return acquired; }
   private: