diff options
Diffstat (limited to 'qpid/cpp')
| -rw-r--r-- | qpid/cpp/examples/messaging/spout.cpp | 1 | ||||
| -rw-r--r-- | qpid/cpp/src/qpid/client/amqp0_10/AddressResolution.cpp | 10 |
2 files changed, 7 insertions, 4 deletions
diff --git a/qpid/cpp/examples/messaging/spout.cpp b/qpid/cpp/examples/messaging/spout.cpp index 275ca416bc..05d66f60e6 100644 --- a/qpid/cpp/examples/messaging/spout.cpp +++ b/qpid/cpp/examples/messaging/spout.cpp @@ -160,7 +160,6 @@ int main(int argc, char** argv) spoutid << id << ":" << count; message.getProperties()["spout-id"] = spoutid.str(); sender.send(message); - std::cout << "Sent " << (count+1) << " of " << options.count << " messages" <<std::endl; } connection.close(); return 0; diff --git a/qpid/cpp/src/qpid/client/amqp0_10/AddressResolution.cpp b/qpid/cpp/src/qpid/client/amqp0_10/AddressResolution.cpp index 146d34932a..b819906677 100644 --- a/qpid/cpp/src/qpid/client/amqp0_10/AddressResolution.cpp +++ b/qpid/cpp/src/qpid/client/amqp0_10/AddressResolution.cpp @@ -127,7 +127,7 @@ const std::string FANOUT_EXCHANGE("fanout"); const std::string DIRECT_EXCHANGE("direct"); const std::string HEADERS_EXCHANGE("headers"); const std::string XML_EXCHANGE("xml"); -const std::string WILDCARD_ANY("*"); +const std::string WILDCARD_ANY("#"); const Verifier verifier; } @@ -529,8 +529,12 @@ void Subscription::bindAll() Binding b(name, queue, "match-all"); b.arguments.setString("x-match", "all"); bindings.push_back(b); - } else { //E.g. direct and xml - throw ResolutionError(QPID_MSG("Cannot create binding to match all messages for exchange of type " << actualType)); + } else if (actualType == XML_EXCHANGE) { + Binding b(name, queue, EMPTY_STRING); + b.arguments.setString("xquery", "true()"); + bindings.push_back(b); + } else { + add(name, EMPTY_STRING); } } |