Updated message.transfer encoding to use header and content segments (including new structs).

Unified more between the basic and message classes messages.



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

1 files changed, 2 insertions, 21 deletions

diff --git a/cpp/src/qpid/broker/RecoveryManagerImpl.cpp b/cpp/src/qpid/broker/RecoveryManagerImpl.cpp
index 954c50faee..29390a6452 100644
--- a/cpp/src/qpid/broker/RecoveryManagerImpl.cpp
+++ b/cpp/src/qpid/broker/RecoveryManagerImpl.cpp
@@ -20,8 +20,7 @@
  */
 #include "RecoveryManagerImpl.h"
 
-#include "BrokerMessage.h"
-#include "BrokerMessageMessage.h"
+#include "Message.h"
 #include "BrokerQueue.h"
 #include "RecoveredEnqueue.h"
 #include "RecoveredDequeue.h"
@@ -110,10 +109,7 @@ RecoverableMessage::shared_ptr RecoveryManagerImpl::recoverMessage(framing::Buff
 {
     buffer.record();
     //peek at type:
-    Message::shared_ptr message(decodeMessageType(buffer) == MESSAGE ?  
-                                ((Message*) new MessageMessage()) : 
-                                ((Message*) new BasicMessage()));
-    buffer.restore();
+    Message::shared_ptr message(new Message());
     message->decodeHeader(buffer);
     return RecoverableMessage::shared_ptr(new RecoverableMessageImpl(message, stagingThreshold));    
 }
@@ -131,21 +127,6 @@ void RecoveryManagerImpl::recoveryComplete()
     //TODO (finalise binding setup etc)
 }
 
-uint8_t RecoveryManagerImpl::decodeMessageType(framing::Buffer& buffer)
-{
-    return buffer.getOctet();
-}
-
-void RecoveryManagerImpl::encodeMessageType(const Message& msg, framing::Buffer& buffer)
-{
-    buffer.putOctet(dynamic_cast<const MessageMessage*>(&msg) ? MESSAGE : BASIC);
-}
-
-uint32_t RecoveryManagerImpl::encodedMessageTypeSize()
-{
-    return 1;
-}
-
 bool RecoverableMessageImpl::loadContent(uint64_t available)
 {
     return !stagingThreshold || available < stagingThreshold;