1 files changed, 2 insertions, 5 deletions
diff --git a/cpp/src/qpid/broker/Timer.cpp b/cpp/src/qpid/broker/Timer.cpp
index be75346578..14727b3b35 100644
--- a/cpp/src/qpid/broker/Timer.cpp
+++ b/cpp/src/qpid/broker/Timer.cpp
@@ -73,17 +73,14 @@ void Timer::start()
     Monitor::ScopedLock l(monitor);
     if (!active) {
         active = true;
-        runner = std::auto_ptr<Thread>(new Thread(this));
+        runner = Thread(this);
     }
 }
 
 void Timer::stop()
 {
     signalStop();
-    if (runner.get()) {
-        runner->join();
-        runner.reset();
-    }
+    runner.join();
 }
 void Timer::signalStop()
 {