summaryrefslogtreecommitdiff
path: root/qpid/cpp
diff options
context:
space:
mode:
authorGordon Sim <gsim@apache.org>2014-08-26 15:18:58 +0000
committerGordon Sim <gsim@apache.org>2014-08-26 15:18:58 +0000
commit4bafc48ac676b56c3b0499e5722dd4c2baecb57c (patch)
treef3eb99b4ee42dfe6d7c0a5377012ae8231cbce4a /qpid/cpp
parentd1bd92b4f13c7f146ed93534e5685b58632fbaf8 (diff)
downloadqpid-python-4bafc48ac676b56c3b0499e5722dd4c2baecb57c.tar.gz
QPID-6045: adjust the reported filter to make clear that wildcard subject filtering is not supported with xml exchange
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1620630 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp')
-rw-r--r--qpid/cpp/src/qpid/broker/amqp/Filter.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/qpid/cpp/src/qpid/broker/amqp/Filter.cpp b/qpid/cpp/src/qpid/broker/amqp/Filter.cpp
index 7da0a88878..b7b29e004d 100644
--- a/qpid/cpp/src/qpid/broker/amqp/Filter.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp/Filter.cpp
@@ -262,7 +262,9 @@ void Filter::bind(boost::shared_ptr<Exchange> exchange, boost::shared_ptr<Queue>
active.push_back(&headersFilter);
} else if (exchange->getType() == XML) {
setDefaultXQueryFilter();
- setDefaultSubjectFilter();
+ if (!setDefaultSubjectFilter() && adjustDirectFilter()) {
+ QPID_LOG(info, "Using legacy topic filter as a direct matching filter for " << exchange->getName());
+ }
bindingArgs.setString(XQUERY, xqueryFilter.value);
active.push_back(&subjectFilter);
active.push_back(&xqueryFilter);