Merge from trunk

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-network-refactor@824198 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 2 insertions, 15 deletions

diff --git a/qpid/cpp/src/qpid/client/amqp0_10/OutgoingMessage.cpp b/qpid/cpp/src/qpid/client/amqp0_10/OutgoingMessage.cpp
index 716f955f98..cbc95b44fb 100644
--- a/qpid/cpp/src/qpid/client/amqp0_10/OutgoingMessage.cpp
+++ b/qpid/cpp/src/qpid/client/amqp0_10/OutgoingMessage.cpp
@@ -33,24 +33,11 @@ namespace amqp0_10 {
 using qpid::messaging::Address;
 using qpid::messaging::MessageImplAccess;
 
-template <class T> void encode(const qpid::messaging::Message& from, qpid::client::Message& to)
-{
-    T codec;
-    MessageImplAccess::get(from).getEncodedContent(codec, to.getData());
-    to.getMessageProperties().setContentType(T::contentType);
-}
-
 void OutgoingMessage::convert(const qpid::messaging::Message& from)
 {
     //TODO: need to avoid copying as much as possible
-    if (from.getContent().isList()) {
-        encode<ListCodec>(from, message);
-    } else if (from.getContent().isMap()) {
-        encode<MapCodec>(from, message);
-    } else {
-        message.setData(from.getBytes());
-        message.getMessageProperties().setContentType(from.getContentType());
-    }
+    message.setData(from.getContent());
+    message.getMessageProperties().setContentType(from.getContentType());
     const Address& address = from.getReplyTo();
     if (!address.value.empty()) {
         message.getMessageProperties().setReplyTo(AddressResolution::convert(address));