diff options
| author | Keith Wall <kwall@apache.org> | 2015-03-03 14:58:01 +0000 |
|---|---|---|
| committer | Keith Wall <kwall@apache.org> | 2015-03-03 14:58:01 +0000 |
| commit | 11a201863b9c989151cf117450785504a61df5ce (patch) | |
| tree | ba96c870aa9ed34edcac0bd07fc0e0138f715bbd /qpid/cpp/src/qpid/broker/amqp/Incoming.cpp | |
| parent | 9dc57fe738f366d875c2319dafdfa2c50ce2f20b (diff) | |
| parent | 83120216de949c1cae3004c74475cc6c54cd61f1 (diff) | |
| download | qpid-python-11a201863b9c989151cf117450785504a61df5ce.tar.gz | |
merge from trunk
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-6262-JavaBrokerNIO@1663719 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/qpid/broker/amqp/Incoming.cpp')
| -rw-r--r-- | qpid/cpp/src/qpid/broker/amqp/Incoming.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/qpid/cpp/src/qpid/broker/amqp/Incoming.cpp b/qpid/cpp/src/qpid/broker/amqp/Incoming.cpp index d4f73fc511..3986818846 100644 --- a/qpid/cpp/src/qpid/broker/amqp/Incoming.cpp +++ b/qpid/cpp/src/qpid/broker/amqp/Incoming.cpp @@ -100,6 +100,7 @@ namespace { boost::intrusive_ptr<qpid::broker::AsyncCompletion::Callback> copy(new Transfer(delivery, session)); return copy; } + private: pn_delivery_t* delivery; boost::shared_ptr<Session> session; @@ -146,8 +147,8 @@ void DecodingIncoming::deliver(boost::intrusive_ptr<qpid::broker::amqp::Message> { qpid::broker::Message message(received, received); userid.verify(message.getUserId()); - handle(message, session.getTransaction(delivery)); received->begin(); + handle(message, session.getTransaction(delivery)); Transfer t(delivery, sessionPtr); received->end(t); } |