From 9649f8ccca2a9f62a946bd58e7d3e8cb60031232 Mon Sep 17 00:00:00 2001 From: Gordon Sim Date: Mon, 31 Mar 2008 17:20:08 +0000 Subject: Updated xml fragment to reflect correct types for connection.start.mechanisms, connection.start.locales and connection.open.capabilities Updated connection handler in line with above changes Added Str16Value to FieldValues Allow Array instances of different types to be created git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@643067 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/broker/ConnectionHandler.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'cpp/src/qpid/broker/ConnectionHandler.cpp') diff --git a/cpp/src/qpid/broker/ConnectionHandler.cpp b/cpp/src/qpid/broker/ConnectionHandler.cpp index 53a403c955..f28c2bb7f7 100644 --- a/cpp/src/qpid/broker/ConnectionHandler.cpp +++ b/cpp/src/qpid/broker/ConnectionHandler.cpp @@ -66,8 +66,12 @@ void ConnectionHandler::handle(framing::AMQFrame& frame) ConnectionHandler::ConnectionHandler(Connection& connection) : handler(new Handler(connection)) { FieldTable properties; - string mechanisms(PLAIN); - string locales(en_US); + Array mechanisms(0x95); + boost::shared_ptr m(new Str16Value(PLAIN)); + mechanisms.add(m); + Array locales(0x95); + boost::shared_ptr l(new Str16Value(en_US)); + locales.add(l); handler->serverMode = true; handler->client.start(properties, mechanisms, locales); } @@ -105,7 +109,7 @@ void ConnectionHandler::Handler::tuneOk(uint16_t /*channelmax*/, } void ConnectionHandler::Handler::open(const string& /*virtualHost*/, - const string& /*capabilities*/, bool /*insist*/) + const framing::Array& /*capabilities*/, bool /*insist*/) { string knownhosts; client.openOk(knownhosts); -- cgit v1.2.1