diff options
| author | Pavel Moravec <pmoravec@apache.org> | 2014-02-03 12:49:01 +0000 |
|---|---|---|
| committer | Pavel Moravec <pmoravec@apache.org> | 2014-02-03 12:49:01 +0000 |
| commit | c3b93ca895efa1175e5891ba73b0407e421ad31e (patch) | |
| tree | db3c912770e896b347395e831037ac9f2ffee820 | |
| parent | ca612300f94b01958740eca34e9deee099351a84 (diff) | |
| download | qpid-python-c3b93ca895efa1175e5891ba73b0407e421ad31e.tar.gz | |
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@1563863 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/cpp/src/qpid/broker/HeadersExchange.cpp | 7 | ||||
| -rw-r--r-- | qpid/tests/src/py/qpid_tests/broker_0_10/exchange.py | 6 |
2 files changed, 12 insertions, 1 deletions
diff --git a/qpid/cpp/src/qpid/broker/HeadersExchange.cpp b/qpid/cpp/src/qpid/broker/HeadersExchange.cpp index 19c7f107f6..585c7ba764 100644 --- a/qpid/cpp/src/qpid/broker/HeadersExchange.cpp +++ b/qpid/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); } } } diff --git a/qpid/tests/src/py/qpid_tests/broker_0_10/exchange.py b/qpid/tests/src/py/qpid_tests/broker_0_10/exchange.py index 315991d585..53de37f12c 100644 --- a/qpid/tests/src/py/qpid_tests/broker_0_10/exchange.py +++ b/qpid/tests/src/py/qpid_tests/broker_0_10/exchange.py @@ -456,6 +456,12 @@ class HeadersExchangeTests(TestHelper): self.myBasicPublish({"irrelevant":0}) self.assertEmpty(self.q) + def testMultipleBindings(self): + self.session.exchange_bind(queue="q", exchange="amq.match", binding_key="SomeKey", arguments={ 'x-match':'any', "name":"fred"}) + self.session.exchange_bind(queue="q", exchange="amq.match", binding_key="AnotherKey", arguments={ 'x-match':'all', "age":3}) + self.myAssertPublishGet({"name":"fred", "age":3}) + self.assertEmpty(self.q) + class MiscellaneousErrorsTests(TestHelper): """ |