Follow PR comments.

2 files changed, 11 insertions, 14 deletions

diff --git a/messagebus/src/vespa/messagebus/routablequeue.cpp b/messagebus/src/vespa/messagebus/routablequeue.cpp
index 121056044ba..494ee11c7cc 100644
--- a/messagebus/src/vespa/messagebus/routablequeue.cpp
+++ b/messagebus/src/vespa/messagebus/routablequeue.cpp
@@ -39,17 +39,17 @@ RoutableQueue::enqueue(Routable::UP r)
 }
 
 Routable::UP
-RoutableQueue::dequeue(duration msTimeout)
+RoutableQueue::dequeue(duration timeout)
 {
     steady_clock::time_point startTime = steady_clock::now();
-    duration msLeft = msTimeout;
+    duration left = timeout;
     vespalib::MonitorGuard guard(_monitor);
-    while (_queue.size() == 0 && msLeft > duration::zero()) {
-        if (!guard.wait(msLeft) || _queue.size() > 0) {
+    while (_queue.size() == 0 && left > duration::zero()) {
+        if (!guard.wait(left) || _queue.size() > 0) {
             break;
         }
         duration elapsed = (steady_clock::now() - startTime);
-        msLeft = (elapsed > msTimeout) ? duration::zero() : msTimeout - elapsed;
+        left = (elapsed > timeout) ? duration::zero() : timeout - elapsed;
     }
     if (_queue.size() == 0) {
         return Routable::UP();
@@ -62,15 +62,13 @@ RoutableQueue::dequeue(duration msTimeout)
 void
 RoutableQueue::handleMessage(Message::UP msg)
 {
-    Routable::UP r(msg.release());
-    enqueue(std::move(r));
+    enqueue(std::move(msg));
 }
 
 void
 RoutableQueue::handleReply(Reply::UP reply)
 {
-    Routable::UP r(reply.release());
-    enqueue(std::move(r));
+    enqueue(std::move(reply));
 }
 
 } // namespace mbus
diff --git a/messagebus/src/vespa/messagebus/routablequeue.h b/messagebus/src/vespa/messagebus/routablequeue.h
index 153686b1669..03f81a7a8d3 100644
--- a/messagebus/src/vespa/messagebus/routablequeue.h
+++ b/messagebus/src/vespa/messagebus/routablequeue.h
@@ -28,10 +28,9 @@ private:
     vespalib::Monitor _monitor;
     Queue<Routable*>  _queue;
 
-    RoutableQueue(const RoutableQueue &);
-    RoutableQueue &operator=(const RoutableQueue &);
-
 public:
+    RoutableQueue(const RoutableQueue &) = delete;
+    RoutableQueue &operator=(const RoutableQueue &) = delete;
     /**
      * Create an empty queue.
      **/
@@ -60,14 +59,14 @@ public:
 
     /**
      * Dequeue a routable from this queue. This method will block if
-     * the queue is currently empty. The 'msTimeout' parameter
+     * the queue is currently empty. The 'timeout' parameter
      * indicate how long to wait for something to be enqueued. If 0 is
      * given as timeout, this method will not block at all, making it
      * perform a simple poll. If the dequeue operation times out, the
      * returned auto-pointer will point to 0.
      *
      * @return the dequeued routable
-     * @param msTimeout how long to wait if the queue is empty
+     * @param timeout how long to wait if the queue is empty
      **/
     Routable::UP dequeue(duration timeout);
     Routable::UP dequeue() { return dequeue(duration::zero());}