QPID-5534: [C++ broker] Headers exchange can route a message to one queue multiple times

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1563863 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 6 insertions, 1 deletions

diff --git a/cpp/src/qpid/broker/HeadersExchange.cpp b/cpp/src/qpid/broker/HeadersExchange.cpp
index 19c7f107f6..585c7ba764 100644
--- a/cpp/src/qpid/broker/HeadersExchange.cpp
+++ b/cpp/src/qpid/broker/HeadersExchange.cpp
@@ -302,7 +302,12 @@ void HeadersExchange::route(Deliverable& msg)
     if (p.get()) {
         for (std::vector<BoundKey>::const_iterator i = p->begin(); i != p->end(); ++i) {
             if (match(i->args, msg.getMessage())) {
-                b->push_back(i->binding);
+                /* check if a binding tothe same queue has not been already added to b */
+                std::vector<boost::shared_ptr<qpid::broker::Exchange::Binding> >::iterator bi = b->begin();
+                while ((bi != b->end()) && ((*bi)->queue != i->binding->queue))
+                    ++bi;
+                if (bi == b->end())
+                    b->push_back(i->binding);
             }
         }
     }