QPID-5421: Refactor: clean up QueueObservers.

Refactor of queue observers to use the broker::Observers base class. Simplifies Queue code
and makes it more consistent with other observers (BrokerObservers, ConnectionObservers.)

Modified Observers base class to allow identical locking behaviour to previous
impementation.

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

1 files changed, 3 insertions, 3 deletions

diff --git a/cpp/src/qpid/ha/QueueGuard.cpp b/cpp/src/qpid/ha/QueueGuard.cpp
index d2792e5e17..6ffd53ff21 100644
--- a/cpp/src/qpid/ha/QueueGuard.cpp
+++ b/cpp/src/qpid/ha/QueueGuard.cpp
@@ -55,8 +55,8 @@ QueueGuard::QueueGuard(broker::Queue& q, const BrokerInfo& info)
     info.printId(os) << ": ";
     logPrefix = os.str();
     observer.reset(new QueueObserver(*this));
-    queue.addObserver(observer);
-    // Set first after calling addObserver so we know that the back of the
+    queue.getObservers().add(observer);
+    // Set first after adding the observer so we know that the back of the
     // queue+1 is (or will be) a guarded position.
     QueuePosition front, back;
     q.getRange(front, back, broker::REPLICATOR);
@@ -86,7 +86,7 @@ void QueueGuard::dequeued(const Message& m) {
 }
 
 void QueueGuard::cancel() {
-    queue.removeObserver(observer);
+    queue.getObservers().remove(observer);
     Mutex::ScopedLock l(lock);
     if (cancelled) return;
     QPID_LOG(debug, logPrefix << "Cancelled");