summaryrefslogtreecommitdiff
path: root/qpid/cpp
diff options
context:
space:
mode:
authorGordon Sim <gsim@apache.org>2013-03-28 15:01:21 +0000
committerGordon Sim <gsim@apache.org>2013-03-28 15:01:21 +0000
commit56bd292e1e13798edef69bc58c6b84bbc38aa888 (patch)
tree31c04db58771a8d166a2e27547771f1b762bd9e5 /qpid/cpp
parent85bfacd06a2395ba9fddc867e546efd7f4168b61 (diff)
downloadqpid-python-56bd292e1e13798edef69bc58c6b84bbc38aa888.tar.gz
QPID-4675: Allow receivers from direct exchanges without a subject filter
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1462139 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp')
-rw-r--r--qpid/cpp/src/qpid/broker/amqp/Session.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/qpid/cpp/src/qpid/broker/amqp/Session.cpp b/qpid/cpp/src/qpid/broker/amqp/Session.cpp
index 62011f6372..c779f47135 100644
--- a/qpid/cpp/src/qpid/broker/amqp/Session.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp/Session.cpp
@@ -235,12 +235,10 @@ void Session::setupOutgoing(pn_link_t* link, pn_terminus_t* source, const std::s
if (filter.hasSubjectFilter()) {
filter.bind(node.exchange, queue);
filter.write(pn_terminus_filter(pn_link_source(link)));
- } else if (node.exchange->getType() == FanOutExchange::typeName) {
- node.exchange->bind(queue, std::string(), 0);
} else if (node.exchange->getType() == TopicExchange::typeName) {
node.exchange->bind(queue, "#", 0);
} else {
- throw qpid::Exception("Exchange type requires a filter: " + node.exchange->getType());/*not-supported?*/
+ node.exchange->bind(queue, std::string(), 0);
}
boost::shared_ptr<Outgoing> q(new OutgoingFromQueue(broker, name, target, queue, link, *this, out, true));
outgoing[link] = q;