Added testSendToSelf for https://bugzilla.redhat.com/show_bug.cgi?id=410551

M      src/tests/ClientSessionTest.cpp

Disabled management for BrokerFixture - management singleton assumes
only one broker per process, causes shutdown races with fixtures.
M      src/tests/BrokerFixture.h

Made Timer::stop() idempotent
M      src/qpid/broker/Timer.cpp
M      src/qpid/broker/Timer.h

Added STL-style size() and empty()
M      src/qpid/sys/BlockingQueue.h
M      src/qpid/client/LocalQueue.cpp
M      src/qpid/client/LocalQueue.h


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

1 files changed, 9 insertions, 2 deletions

diff --git a/cpp/src/qpid/client/LocalQueue.cpp b/cpp/src/qpid/client/LocalQueue.cpp
index f44a04837b..951996f005 100644
--- a/cpp/src/qpid/client/LocalQueue.cpp
+++ b/cpp/src/qpid/client/LocalQueue.cpp
@@ -47,11 +47,18 @@ Message LocalQueue::pop() {
 
 void LocalQueue::setAckPolicy(AckPolicy a) { autoAck=a; }
 
-bool LocalQueue::empty() 
+bool LocalQueue::empty() const
 { 
     if (!queue)
         throw ClosedException();
-    return queue->isEmpty(); 
+    return queue->empty(); 
+}
+
+size_t LocalQueue::size() const
+{ 
+    if (!queue)
+        throw ClosedException();
+    return queue->size(); 
 }
 
 }} // namespace qpid::client