diff options
Diffstat (limited to 'qpid/cpp/src')
| -rw-r--r-- | qpid/cpp/src/qpid/broker/HeadersExchange.cpp | 2 | ||||
| -rw-r--r-- | qpid/cpp/src/tests/HeadersExchangeTest.cpp | 16 |
2 files changed, 17 insertions, 1 deletions
diff --git a/qpid/cpp/src/qpid/broker/HeadersExchange.cpp b/qpid/cpp/src/qpid/broker/HeadersExchange.cpp index 55cdb73ac1..215a002517 100644 --- a/qpid/cpp/src/qpid/broker/HeadersExchange.cpp +++ b/qpid/cpp/src/qpid/broker/HeadersExchange.cpp @@ -46,7 +46,7 @@ HeadersExchange::HeadersExchange(const std::string& _name, bool _durable, const bool HeadersExchange::bind(Queue::shared_ptr queue, const string& /*routingKey*/, const FieldTable* args){ RWlock::ScopedWlock locker(lock); FieldTable::ValuePtr what = args->get(x_match); - if (*what != all && *what != any) { + if (!what || (*what != all && *what != any)) { THROW_QPID_ERROR(PROTOCOL_ERROR, "Invalid x-match value binding to headers exchange."); } Binding binding(*args, queue); diff --git a/qpid/cpp/src/tests/HeadersExchangeTest.cpp b/qpid/cpp/src/tests/HeadersExchangeTest.cpp index 14c60449ec..c47266caa6 100644 --- a/qpid/cpp/src/tests/HeadersExchangeTest.cpp +++ b/qpid/cpp/src/tests/HeadersExchangeTest.cpp @@ -19,6 +19,7 @@ * */ +#include "qpid/QpidError.h" #include "qpid/broker/HeadersExchange.h" #include "qpid/framing/FieldTable.h" #include "qpid/framing/FieldValue.h" @@ -35,6 +36,7 @@ class HeadersExchangeTest : public CppUnit::TestCase CPPUNIT_TEST(testMatchEmptyValue); CPPUNIT_TEST(testMatchEmptyArgs); CPPUNIT_TEST(testMatchNoXMatch); + CPPUNIT_TEST(testBindNoXMatch); CPPUNIT_TEST_SUITE_END(); public: @@ -107,6 +109,20 @@ class HeadersExchangeTest : public CppUnit::TestCase CPPUNIT_ASSERT(!HeadersExchange::match(b, m)); } + void testBindNoXMatch() + { + HeadersExchange exchange("test"); + Queue::shared_ptr queue; + std::string key; + FieldTable args; + try { + //just checking this doesn't cause assertion etc + exchange.bind(queue, key, &args); + } catch(qpid::QpidError&) { + //expected + } + } + }; |