From 4bafc48ac676b56c3b0499e5722dd4c2baecb57c Mon Sep 17 00:00:00 2001 From: Gordon Sim Date: Tue, 26 Aug 2014 15:18:58 +0000 Subject: 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 --- qpid/cpp/src/qpid/broker/amqp/Filter.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'qpid/cpp/src') 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, boost::shared_ptr 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); -- cgit v1.2.1