Removed BodyHolder: minor performance improvement, opens the way for more efficient memory management.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@736783 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 2 insertions, 3 deletions

diff --git a/cpp/src/qpid/broker/Message.cpp b/cpp/src/qpid/broker/Message.cpp
index 89f2653a21..6bcee99f49 100644
--- a/cpp/src/qpid/broker/Message.cpp
+++ b/cpp/src/qpid/broker/Message.cpp
@@ -157,8 +157,7 @@ void Message::decodeContent(framing::Buffer& buffer)
     if (buffer.available()) {
         //get the data as a string and set that as the content
         //body on a frame then add that frame to the frameset
-        AMQFrame frame;
-        frame.setBody(AMQContentBody());
+        AMQFrame frame((AMQContentBody()));
         frame.castBody<AMQContentBody>()->decode(buffer, buffer.available());
         frames.append(frame);
     } else {
@@ -208,7 +207,7 @@ void Message::sendContent(Queue& queue, framing::FrameHandler& out, uint16_t max
         bool done = false;
         for (uint64_t offset = 0; !done; offset += maxContentSize)
         {            
-            AMQFrame frame(in_place<AMQContentBody>());
+            AMQFrame frame((AMQContentBody()));
             string& data = frame.castBody<AMQContentBody>()->getData();
 
             store->loadContent(queue, pmsg, data, offset, maxContentSize);