You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kg...@apache.org on 2011/06/22 17:17:41 UTC
svn commit: r1138502 - in /qpid/branches/qpid-3079/qpid/cpp/src/qpid/broker:
PersistableMessage.h Queue.cpp SessionState.h
Author: kgiusti
Date: Wed Jun 22 15:17:38 2011
New Revision: 1138502
URL: http://svn.apache.org/viewvc?rev=1138502&view=rev
Log:
QPID-3079: remove obsolete method, clean up comments
Modified:
qpid/branches/qpid-3079/qpid/cpp/src/qpid/broker/PersistableMessage.h
qpid/branches/qpid-3079/qpid/cpp/src/qpid/broker/Queue.cpp
qpid/branches/qpid-3079/qpid/cpp/src/qpid/broker/SessionState.h
Modified: qpid/branches/qpid-3079/qpid/cpp/src/qpid/broker/PersistableMessage.h
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3079/qpid/cpp/src/qpid/broker/PersistableMessage.h?rev=1138502&r1=1138501&r2=1138502&view=diff
==============================================================================
--- qpid/branches/qpid-3079/qpid/cpp/src/qpid/broker/PersistableMessage.h (original)
+++ qpid/branches/qpid-3079/qpid/cpp/src/qpid/broker/PersistableMessage.h Wed Jun 22 15:17:38 2011
@@ -113,8 +113,6 @@ class PersistableMessage : public Persis
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);
Modified: qpid/branches/qpid-3079/qpid/cpp/src/qpid/broker/Queue.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3079/qpid/cpp/src/qpid/broker/Queue.cpp?rev=1138502&r1=1138501&r2=1138502&view=diff
==============================================================================
--- qpid/branches/qpid-3079/qpid/cpp/src/qpid/broker/Queue.cpp (original)
+++ qpid/branches/qpid-3079/qpid/cpp/src/qpid/broker/Queue.cpp Wed Jun 22 15:17:38 2011
@@ -682,7 +682,6 @@ Queue::dequeue(TransactionContext* ctxt,
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());
{
Modified: qpid/branches/qpid-3079/qpid/cpp/src/qpid/broker/SessionState.h
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3079/qpid/cpp/src/qpid/broker/SessionState.h?rev=1138502&r1=1138501&r2=1138502&view=diff
==============================================================================
--- qpid/branches/qpid-3079/qpid/cpp/src/qpid/broker/SessionState.h (original)
+++ qpid/branches/qpid-3079/qpid/cpp/src/qpid/broker/SessionState.h Wed Jun 22 15:17:38 2011
@@ -262,7 +262,10 @@ class SessionState : public qpid::Sessio
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;
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org