diff options
Diffstat (limited to 'cpp/src/qpid/broker/Exchange.cpp')
| -rw-r--r-- | cpp/src/qpid/broker/Exchange.cpp | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/cpp/src/qpid/broker/Exchange.cpp b/cpp/src/qpid/broker/Exchange.cpp index b499171418..d143471559 100644 --- a/cpp/src/qpid/broker/Exchange.cpp +++ b/cpp/src/qpid/broker/Exchange.cpp @@ -23,7 +23,6 @@ #include "qpid/broker/ExchangeRegistry.h" #include "qpid/broker/FedOps.h" #include "qpid/broker/Broker.h" -#include "qpid/broker/Cluster.h" #include "qpid/management/ManagementAgent.h" #include "qpid/broker/Queue.h" #include "qpid/log/Statement.h" @@ -71,23 +70,10 @@ Exchange::PreRoute::~PreRoute(){ } } -// Bracket a scope with calls to Cluster::routing and Cluster::routed -struct ScopedClusterRouting { - Broker* broker; - boost::intrusive_ptr<Message> message; - ScopedClusterRouting(Broker* b, boost::intrusive_ptr<Message> m) - : broker(b), message(m) { - if (broker) broker->getCluster().routing(message); - } - ~ScopedClusterRouting() { - if (broker) broker->getCluster().routed(message); - } -}; - void Exchange::doRoute(Deliverable& msg, ConstBindingList b) { - ScopedClusterRouting scr(broker, &msg.getMessage()); int count = 0; + if (b.get()) { // Block the content release if the message is transient AND there is more than one binding if (!msg.getMessage().isPersistent() && b->size() > 1) { |