3 files changed, 29 insertions, 3 deletions
diff --git a/cpp/src/qpid/client/MessageReplayTracker.cpp b/cpp/src/qpid/client/MessageReplayTracker.cpp
index 3c36b03b34..9ffbb76837 100644
--- a/cpp/src/qpid/client/MessageReplayTracker.cpp
+++ b/cpp/src/qpid/client/MessageReplayTracker.cpp
@@ -28,8 +28,8 @@ MessageReplayTracker::MessageReplayTracker(uint f) : flushInterval(f), count(0)
 
 void MessageReplayTracker::send(const Message& message, const std::string& destination)
 {
-    ReplayRecord record(message, destination);
-    record.send(*this);
+    buffer.push_back(ReplayRecord(message, destination));    
+    buffer.back().send(*this);
     if (flushInterval && ++count >= flushInterval) {
         checkCompletion();
         if (!buffer.empty()) session.flush();
@@ -70,7 +70,6 @@ MessageReplayTracker::ReplayRecord::ReplayRecord(const Message& m, const std::st
 void MessageReplayTracker::ReplayRecord::send(MessageReplayTracker& tracker)
 {
     status = tracker.session.messageTransfer(arg::destination=destination, arg::content=message);
-    tracker.buffer.push_back(*this);    
 }
 
 bool MessageReplayTracker::ReplayRecord::isComplete()
diff --git a/cpp/src/qpid/client/MessageReplayTracker.h b/cpp/src/qpid/client/MessageReplayTracker.h
index 40324de4e9..45b16fb704 100644
--- a/cpp/src/qpid/client/MessageReplayTracker.h
+++ b/cpp/src/qpid/client/MessageReplayTracker.h
@@ -44,6 +44,13 @@ class MessageReplayTracker
     void setFlushInterval(uint interval);
     uint getFlushInterval();
     void checkCompletion();
+
+    template <class F> void foreach(F& f) {
+        for (std::list<ReplayRecord>::const_iterator i = buffer.begin(); i != buffer.end(); i++) {
+            f(i->message);
+        }
+    }
+
   private:
     struct ReplayRecord
     {
diff --git a/cpp/src/tests/MessageReplayTracker.cpp b/cpp/src/tests/MessageReplayTracker.cpp
index ba0174345f..a5121cdeb7 100644
--- a/cpp/src/tests/MessageReplayTracker.cpp
+++ b/cpp/src/tests/MessageReplayTracker.cpp
@@ -29,6 +29,23 @@ using namespace qpid::client;
 using namespace qpid::sys;
 using std::string;
 
+class ReplayBufferChecker
+{
+  public:
+
+    ReplayBufferChecker(uint from, uint to) : end(to), i(from) {}
+
+    void operator()(const Message& m)
+    {
+        if (i > end) BOOST_FAIL("Extra message found: " + m.getData());
+        BOOST_CHECK_EQUAL((boost::format("Message_%1%") % (i++)).str(), m.getData());
+    }
+  private:
+    const uint end;
+    uint i;
+
+};
+
 QPID_AUTO_TEST_CASE(testReplay)
 {
     ProxySessionFixture fix;
@@ -40,6 +57,9 @@ QPID_AUTO_TEST_CASE(testReplay)
         Message message((boost::format("Message_%1%") % (i+1)).str(), "my-queue");        
         tracker.send(message);
     }
+    ReplayBufferChecker checker(1, 10);
+    tracker.foreach(checker);
+
     tracker.replay(fix.session);
     for (uint j = 0; j < 2; j++) {//each message should have been sent twice
         for (uint i = 0; i < 5; i++) {