diff options
| author | Kenneth Anthony Giusti <kgiusti@apache.org> | 2011-06-22 15:17:38 +0000 |
|---|---|---|
| committer | Kenneth Anthony Giusti <kgiusti@apache.org> | 2011-06-22 15:17:38 +0000 |
| commit | bc8d6d3ccdaeb5d09d73b08181747668a8184931 (patch) | |
| tree | 78e2396d4afcd98818efbc64802e88631633d3ce | |
| parent | 9e9da9a82c79f6f6e15ba7ba86c2554932654cda (diff) | |
| download | qpid-python-bc8d6d3ccdaeb5d09d73b08181747668a8184931.tar.gz | |
QPID-3079: remove obsolete method, clean up comments
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/qpid-3079@1138502 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/cpp/src/qpid/broker/PersistableMessage.h | 2 | ||||
| -rw-r--r-- | qpid/cpp/src/qpid/broker/Queue.cpp | 1 | ||||
| -rw-r--r-- | qpid/cpp/src/qpid/broker/SessionState.h | 5 |
3 files changed, 4 insertions, 4 deletions
diff --git a/qpid/cpp/src/qpid/broker/PersistableMessage.h b/qpid/cpp/src/qpid/broker/PersistableMessage.h index 76a44a4cf7..e56912a054 100644 --- a/qpid/cpp/src/qpid/broker/PersistableMessage.h +++ b/qpid/cpp/src/qpid/broker/PersistableMessage.h @@ -113,8 +113,6 @@ class PersistableMessage : public Persistable QPID_BROKER_EXTERN void dequeueComplete(PersistableQueue::shared_ptr queue, MessageStore* _store); - QPID_BROKER_EXTERN void dequeueAsync(PersistableQueue::shared_ptr, MessageStore*) {} - bool isStoredOnQueue(PersistableQueue::shared_ptr queue); void addToSyncList(PersistableQueue::shared_ptr queue, MessageStore* _store); diff --git a/qpid/cpp/src/qpid/broker/Queue.cpp b/qpid/cpp/src/qpid/broker/Queue.cpp index 260a45d7e0..fc8cbc47f5 100644 --- a/qpid/cpp/src/qpid/broker/Queue.cpp +++ b/qpid/cpp/src/qpid/broker/Queue.cpp @@ -682,7 +682,6 @@ Queue::dequeue(TransactionContext* ctxt, const QueuedMessage& msg) bool fp = msg.payload->isForcedPersistent(); if (!fp || (fp && msg.payload->isStoredOnQueue(shared_from_this()))) { if ((msg.payload->isPersistent() || msg.payload->checkContentReleasable()) && store) { - msg.payload->dequeueAsync(shared_from_this(), store); boost::intrusive_ptr<PersistableMessage> pmsg = boost::static_pointer_cast<PersistableMessage>(msg.payload); boost::intrusive_ptr<DequeueCompletion> dc(new DequeueCompletion()); { diff --git a/qpid/cpp/src/qpid/broker/SessionState.h b/qpid/cpp/src/qpid/broker/SessionState.h index cd6123688b..0da61dabd3 100644 --- a/qpid/cpp/src/qpid/broker/SessionState.h +++ b/qpid/cpp/src/qpid/broker/SessionState.h @@ -262,7 +262,10 @@ class SessionState : public qpid::SessionState, virtual boost::intrusive_ptr<AsyncCompletion::Callback> clone(); private: - /** @todo KAG COMMENT ME */ + /** If the enqueue of this message is asynchronous, we must notify the + * session when the enqueues have completed and the Message.Transfer + * command can be completed. This is done by a AsyncCommandContext. + */ class CommandContext : public AsyncCommandContext { boost::intrusive_ptr<Message> msg; |