1 files changed, 21 insertions, 3 deletions
diff --git a/cpp/src/tests/storePerftools/asyncPerf/QueuedMessage.cpp b/cpp/src/tests/storePerftools/asyncPerf/QueuedMessage.cpp
index a733a96171..572089faaf 100644
--- a/cpp/src/tests/storePerftools/asyncPerf/QueuedMessage.cpp
+++ b/cpp/src/tests/storePerftools/asyncPerf/QueuedMessage.cpp
@@ -41,18 +41,24 @@ QueuedMessage::QueuedMessage(SimpleQueue* q,
         boost::enable_shared_from_this<QueuedMessage>(),
         m_queue(q),
         m_msg(msg)
-{}
+{
+    if (m_queue->getStore()) {
+        m_enqHandle = q->getStore()->createEnqueueHandle(msg->getHandle(), q->getHandle());
+    }
+}
 
 QueuedMessage::QueuedMessage(const QueuedMessage& qm) :
         boost::enable_shared_from_this<QueuedMessage>(),
         m_queue(qm.m_queue),
-        m_msg(qm.m_msg)
+        m_msg(qm.m_msg),
+        m_enqHandle(qm.m_enqHandle)
 {}
 
 QueuedMessage::QueuedMessage(QueuedMessage* const qm) :
         boost::enable_shared_from_this<QueuedMessage>(),
         m_queue(qm->m_queue),
-        m_msg(qm->m_msg)
+        m_msg(qm->m_msg),
+        m_enqHandle(qm->m_enqHandle)
 {}
 
 QueuedMessage::~QueuedMessage()
@@ -70,6 +76,18 @@ QueuedMessage::payload() const
     return m_msg;
 }
 
+const qpid::broker::EnqueueHandle&
+QueuedMessage::enqHandle() const
+{
+    return m_enqHandle;
+}
+
+qpid::broker::EnqueueHandle&
+QueuedMessage::enqHandle()
+{
+    return m_enqHandle;
+}
+
 void
 QueuedMessage::prepareEnqueue(qpid::broker::TxnHandle& th)
 {