From 9c73ef7a5ac10acd6a50d5d52bd721fc2faa5919 Mon Sep 17 00:00:00 2001 From: Kim van der Riet Date: Thu, 28 Feb 2013 16:14:30 +0000 Subject: Update from trunk r1375509 through r1450773 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/asyncstore@1451244 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/ha/QueueRange.h | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'cpp/src/qpid/ha/QueueRange.h') diff --git a/cpp/src/qpid/ha/QueueRange.h b/cpp/src/qpid/ha/QueueRange.h index d734326910..f67ac146e6 100644 --- a/cpp/src/qpid/ha/QueueRange.h +++ b/cpp/src/qpid/ha/QueueRange.h @@ -24,6 +24,7 @@ #include "ReplicatingSubscription.h" #include "qpid/broker/Queue.h" +#include "qpid/broker/QueueCursor.h" #include "qpid/framing/FieldTable.h" #include "qpid/framing/SequenceNumber.h" #include @@ -51,15 +52,7 @@ struct QueueRange { QueueRange() : front(1), back(0) { } // Empty range. - QueueRange(broker::Queue& q) { - if (ReplicatingSubscription::getFront(q, front)) - back = q.getPosition(); - else { - back = q.getPosition(); - front = back+1; // empty - } - assert(front <= back + 1); - } + QueueRange(broker::Queue& q) { q.getRange(front, back, broker::REPLICATOR); } QueueRange(const framing::FieldTable& args) { back = args.getAsInt(ReplicatingSubscription::QPID_BACK); -- cgit v1.2.1