diff options
Diffstat (limited to 'cpp/src/qpid')
| -rw-r--r-- | cpp/src/qpid/framing/FieldTable.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/qpid/management/ManagementAgent.cpp | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/cpp/src/qpid/framing/FieldTable.cpp b/cpp/src/qpid/framing/FieldTable.cpp index 089bc5d4a5..ac2a0f286d 100644 --- a/cpp/src/qpid/framing/FieldTable.cpp +++ b/cpp/src/qpid/framing/FieldTable.cpp @@ -66,7 +66,7 @@ void FieldTable::set(const std::string& name, const ValuePtr& value){ } void FieldTable::setString(const std::string& name, const std::string& value){ - values[name] = ValuePtr(new StringValue(value)); + values[name] = ValuePtr(new Str16Value(value)); } void FieldTable::setInt(const std::string& name, int value){ diff --git a/cpp/src/qpid/management/ManagementAgent.cpp b/cpp/src/qpid/management/ManagementAgent.cpp index 769593c8d2..9b4290232d 100644 --- a/cpp/src/qpid/management/ManagementAgent.cpp +++ b/cpp/src/qpid/management/ManagementAgent.cpp @@ -24,7 +24,7 @@ #include "qpid/log/Statement.h" #include <qpid/broker/Message.h> #include <qpid/broker/MessageDelivery.h> -#include "qpid/framing/MessageXTransferBody.h" +#include "qpid/framing/MessageTransferBody.h" #include <list> #include <iostream> #include <fstream> @@ -218,8 +218,8 @@ void ManagementAgent::SendBuffer (Buffer& buf, return; intrusive_ptr<Message> msg (new Message ()); - AMQFrame method (in_place<MessageXTransferBody>( - ProtocolVersion(), 0, exchange->getName (), 0, 0)); + AMQFrame method (in_place<MessageTransferBody>( + ProtocolVersion(), exchange->getName (), 0, 0)); AMQFrame header (in_place<AMQHeaderBody>()); AMQFrame content(in_place<AMQContentBody>()); @@ -233,8 +233,8 @@ void ManagementAgent::SendBuffer (Buffer& buf, msg->getFrames().append(method); msg->getFrames().append(header); - PreviewMessageProperties* props = - msg->getFrames().getHeaders()->get<PreviewMessageProperties>(true); + MessageProperties* props = + msg->getFrames().getHeaders()->get<MessageProperties>(true); props->setContentLength(length); msg->getFrames().append(content); @@ -394,8 +394,8 @@ void ManagementAgent::dispatchMethod (Message& msg, uint64_t objId = inBuffer.getLongLong (); string replyToKey; - const framing::PreviewMessageProperties* p = - msg.getFrames().getHeaders()->get<framing::PreviewMessageProperties>(); + const framing::MessageProperties* p = + msg.getFrames().getHeaders()->get<framing::MessageProperties>(); if (p && p->hasReplyTo()) { const framing::ReplyTo& rt = p->getReplyTo (); @@ -601,8 +601,8 @@ void ManagementAgent::dispatchAgentCommand (Message& msg) uint32_t sequence; string replyToKey; - const framing::PreviewMessageProperties* p = - msg.getFrames().getHeaders()->get<framing::PreviewMessageProperties>(); + const framing::MessageProperties* p = + msg.getFrames().getHeaders()->get<framing::MessageProperties>(); if (p && p->hasReplyTo()) { const framing::ReplyTo& rt = p->getReplyTo (); |