summaryrefslogtreecommitdiff
path: root/cpp/src/qpid/broker
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/qpid/broker')
-rw-r--r--cpp/src/qpid/broker/ConnectionHandler.cpp10
-rw-r--r--cpp/src/qpid/broker/ConnectionHandler.h2
2 files changed, 8 insertions, 4 deletions
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<FieldValue> m(new Str16Value(PLAIN));
+ mechanisms.add(m);
+ Array locales(0x95);
+ boost::shared_ptr<FieldValue> 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);
diff --git a/cpp/src/qpid/broker/ConnectionHandler.h b/cpp/src/qpid/broker/ConnectionHandler.h
index 8e659f0913..56de1c7517 100644
--- a/cpp/src/qpid/broker/ConnectionHandler.h
+++ b/cpp/src/qpid/broker/ConnectionHandler.h
@@ -56,7 +56,7 @@ class ConnectionHandler : public framing::FrameHandler
void tuneOk(uint16_t channelMax, uint32_t frameMax, uint16_t heartbeat);
void heartbeat() {}
void open(const std::string& virtualHost,
- const std::string& capabilities, bool insist);
+ const framing::Array& capabilities, bool insist);
void close(uint16_t replyCode, const std::string& replyText,
uint16_t classId, uint16_t methodId);
void closeOk();