1 files changed, 58 insertions, 6 deletions

diff --git a/cpp/src/tests/storePerftools/asyncPerf/QueuedMessage.cpp b/cpp/src/tests/storePerftools/asyncPerf/QueuedMessage.cpp
index 9e5e131a28..7903d6551a 100644
--- a/cpp/src/tests/storePerftools/asyncPerf/QueuedMessage.cpp
+++ b/cpp/src/tests/storePerftools/asyncPerf/QueuedMessage.cpp
@@ -23,20 +23,71 @@
 
 #include "QueuedMessage.h"
 
-#include "MockTransactionContext.h"
+#include "MockPersistableMessage.h"
+#include "MockPersistableQueue.h"
+
+#include "qpid/asyncStore/AsyncStoreImpl.h"
 
 namespace tests {
 namespace storePerftools {
 namespace asyncPerf {
 
-QueuedMessage::QueuedMessage(MockPersistableMessage::shared_ptr msg,
+QueuedMessage::QueuedMessage() :
+        m_queue(0)
+{}
+
+QueuedMessage::QueuedMessage(MockPersistableQueue* q,
+                             boost::shared_ptr<MockPersistableMessage> msg) :
+        m_queue(q),
+        m_msg(msg),
+        m_enqHandle(q->getStore()->createEnqueueHandle(msg->getHandle(), q->getHandle()))
+{}
+
+QueuedMessage::QueuedMessage(const QueuedMessage& qm) :
+        m_queue(qm.m_queue),
+        m_msg(qm.m_msg),
+        m_enqHandle(qm.m_enqHandle)
+{}
+
+QueuedMessage::~QueuedMessage()
+{}
+
+QueuedMessage&
+QueuedMessage::operator=(const QueuedMessage& rhs)
+{
+    m_queue = rhs.m_queue;
+    m_msg = rhs.m_msg;
+    m_enqHandle = rhs.m_enqHandle;
+    return *this;
+}
+
+boost::shared_ptr<MockPersistableMessage>
+QueuedMessage::payload() const
+{
+    return m_msg;
+}
+
+const qpid::broker::EnqueueHandle&
+QueuedMessage::enqHandle() const
+{
+    return m_enqHandle;
+}
+
+qpid::broker::EnqueueHandle&
+QueuedMessage::enqHandle()
+{
+    return m_enqHandle;
+}
+
+/*
+QueuedMessage::QueuedMessage(boost::shared_ptr<MockPersistableMessage> msg,
                              qpid::broker::EnqueueHandle& enqHandle,
-                             MockTransactionContextPtr txn) :
+                             boost::shared_ptr<MockTransactionContext> txn) :
         m_msg(msg),
         m_enqHandle(enqHandle),
         m_txn(txn)
 {
-    if (txn) {
+    if (txn.get()) {
         txn->addEnqueuedMsg(this);
     }
 }
@@ -44,7 +95,7 @@ QueuedMessage::QueuedMessage(MockPersistableMessage::shared_ptr msg,
 QueuedMessage::~QueuedMessage()
 {}
 
-MockPersistableMessage::shared_ptr
+boost::shared_ptr<MockPersistableMessage>
 QueuedMessage::getMessage() const
 {
     return m_msg;
@@ -56,7 +107,7 @@ QueuedMessage::getEnqueueHandle() const
     return m_enqHandle;
 }
 
-MockTransactionContextPtr
+boost::shared_ptr<MockTransactionContext>
 QueuedMessage::getTransactionContext() const
 {
     return m_txn;
@@ -73,5 +124,6 @@ QueuedMessage::clearTransaction()
 {
     m_txn.reset(static_cast<MockTransactionContext*>(0));
 }
+*/
 
 }}} // namespace tests::storePerfTools