You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by gs...@apache.org on 2013/08/09 19:01:04 UTC
svn commit: r1512394 - in /qpid/branches/0.24/qpid: ./ cpp/src/
cpp/src/qpid/broker/ cpp/src/qpid/broker/amqp/Session.cpp
Author: gsim
Date: Fri Aug 9 17:01:03 2013
New Revision: 1512394
URL: http://svn.apache.org/r1512394
Log:
QPID-5061: do exclusivity checks before registering link to avoid cancelling a subscription that did not succeed (merged from r1512218)
Modified:
qpid/branches/0.24/qpid/ (props changed)
qpid/branches/0.24/qpid/cpp/src/ (props changed)
qpid/branches/0.24/qpid/cpp/src/qpid/broker/ (props changed)
qpid/branches/0.24/qpid/cpp/src/qpid/broker/amqp/Session.cpp
Propchange: qpid/branches/0.24/qpid/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid:r1512218
Propchange: qpid/branches/0.24/qpid/cpp/src/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/cpp/src:r1512218
Propchange: qpid/branches/0.24/qpid/cpp/src/qpid/broker/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/cpp/src/qpid/broker:r1512218
Modified: qpid/branches/0.24/qpid/cpp/src/qpid/broker/amqp/Session.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/0.24/qpid/cpp/src/qpid/broker/amqp/Session.cpp?rev=1512394&r1=1512393&r2=1512394&view=diff
==============================================================================
--- qpid/branches/0.24/qpid/cpp/src/qpid/broker/amqp/Session.cpp (original)
+++ qpid/branches/0.24/qpid/cpp/src/qpid/broker/amqp/Session.cpp Fri Aug 9 17:01:03 2013
@@ -351,8 +351,8 @@ void Session::setupOutgoing(pn_link_t* l
authorise.outgoing(node.exchange, queue, filter);
filter.bind(node.exchange, queue);
boost::shared_ptr<Outgoing> q(new OutgoingFromQueue(connection.getBroker(), name, target, queue, link, *this, out, !shared, false));
- outgoing[link] = q;
q->init();
+ outgoing[link] = q;
} else if (node.relay) {
boost::shared_ptr<Outgoing> out(new OutgoingFromRelay(link, connection.getBroker(), *this, name, target, pn_link_name(link), node.relay));
outgoing[link] = out;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org