common/Timer: fix deadlock in RWTimer::shutdown

Fixes: #9213
Signed-off-by: John Spray <john.spray@redhat.com>

diff --git a/src/common/Timer.cc b/src/common/Timer.cc
index e64d504557e0f6831696a2390e9f4cfb51064d75..6282eacec13d6930d0cdc152fc2ecd35559de48b 100644 (file)
--- a/src/common/Timer.cc
+++ b/src/common/Timer.cc
@@ -231,7 +231,9 @@ void RWTimer::shutdown()
     lock.Lock();
     cond.Signal();
     lock.Unlock();
+    rwlock.unlock();
     thread->join();
+    rwlock.get_write();
     delete thread;
     thread = NULL;
   }