diff options
| author | Gordon Sim <gsim@apache.org> | 2008-10-21 23:30:32 +0000 |
|---|---|---|
| committer | Gordon Sim <gsim@apache.org> | 2008-10-21 23:30:32 +0000 |
| commit | 9dcdabfb693f77c801f5f183f662858d26c1ffc6 (patch) | |
| tree | 5d1af817a6e4b712871071ce234203c75ad2e0b9 /cpp/src/qpid/broker/SessionAdapter.cpp | |
| parent | e128333aaf32ee56df6a5ccadb2b20c6c78fcf82 (diff) | |
| download | qpid-python-9dcdabfb693f77c801f5f183f662858d26c1ffc6.tar.gz | |
Refactored DeliveryRecord and delivery path to remove some redundant code.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@706811 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/broker/SessionAdapter.cpp')
| -rw-r--r-- | cpp/src/qpid/broker/SessionAdapter.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/cpp/src/qpid/broker/SessionAdapter.cpp b/cpp/src/qpid/broker/SessionAdapter.cpp index e09c94398b..c5a55b64a3 100644 --- a/cpp/src/qpid/broker/SessionAdapter.cpp +++ b/cpp/src/qpid/broker/SessionAdapter.cpp @@ -17,8 +17,6 @@ */ #include "SessionAdapter.h" #include "Connection.h" -#include "DeliveryToken.h" -#include "MessageDelivery.h" #include "Queue.h" #include "qpid/Exception.h" #include "qpid/framing/reply_exceptions.h" @@ -478,10 +476,9 @@ SessionAdapter::MessageHandlerImpl::subscribe(const string& queueName, if(!destination.empty() && state.exists(destination)) throw NotAllowedException(QPID_MSG("Consumer tags must be unique")); - string tag = destination; - state.consume(MessageDelivery::getMessageDeliveryToken(destination, acceptMode, acquireMode), - tag, queue, false, //TODO get rid of no-local - acceptMode == 0, acquireMode == 0, exclusive, resumeId, resumeTtl, arguments); + state.consume(destination, queue, + acceptMode == 0, acquireMode == 0, exclusive, + resumeId, resumeTtl, arguments); ManagementAgent* agent = ManagementAgent::Singleton::getInstance(); if (agent) |