1 files changed, 7 insertions, 5 deletions

diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/ping/PingAsyncTestPerf.java b/qpid/java/perftests/src/test/java/org/apache/qpid/ping/PingAsyncTestPerf.java
index 27de27faf3..c01987cfc0 100644
--- a/qpid/java/perftests/src/test/java/org/apache/qpid/ping/PingAsyncTestPerf.java
+++ b/qpid/java/perftests/src/test/java/org/apache/qpid/ping/PingAsyncTestPerf.java
@@ -156,7 +156,7 @@ public class PingAsyncTestPerf extends PingTestPerf implements TimingControllerA
 
         // Attach the chained message listener to the ping producer to listen asynchronously for the replies to these
         // messages.
-        pingClient.setChainedMessageListener(batchedResultsListener);
+        //pingClient.setChainedMessageListener(batchedResultsListener);
 
         // Generate a sample message of the specified size.
         ObjectMessage msg =
@@ -166,7 +166,7 @@ public class PingAsyncTestPerf extends PingTestPerf implements TimingControllerA
 
         // Send the requested number of messages, and wait until they have all been received.
         long timeout = Long.parseLong(testParameters.getProperty(PingPongProducer.TIMEOUT_PROPNAME));
-        int numReplies = pingClient.pingAndWaitForReply(msg, numPings, timeout);
+        int numReplies = pingClient.pingAndWaitForReply(msg, numPings, timeout, messageCorrelationId);
 
         // Check that all the replies were received and log a fail if they were not.
         if (numReplies < numPings)
@@ -175,7 +175,7 @@ public class PingAsyncTestPerf extends PingTestPerf implements TimingControllerA
         }
 
         // Remove the chained message listener from the ping producer.
-        pingClient.removeChainedMessageListener();
+        //pingClient.removeChainedMessageListener();
 
         // Remove the expected count and timing controller for the message correlation id, to ensure they are cleaned up.
         perCorrelationIds.remove(messageCorrelationId);
@@ -250,14 +250,16 @@ public class PingAsyncTestPerf extends PingTestPerf implements TimingControllerA
          */
         public void onMessage(Message message, int remainingCount) throws JMSException
         {
-            _logger.debug("public void onMessage(Message message, int remainingCount = " + remainingCount + "): called");
-
             // Check if a batch boundary has been crossed.
             if ((remainingCount % _batchSize) == 0)
             {
                 // Extract the correlation id from the message.
                 String correlationId = message.getJMSCorrelationID();
 
+                _logger.debug("public void onMessage(Message message, int remainingCount = " + remainingCount +
+                              "): called on batch boundary for message id: "
+                              + correlationId + " with thread id: " + Thread.currentThread().getId());
+
                 // Get the details for the correlation id and check that they are not null. They can become null
                 // if a test times out.
                 PerCorrelationId perCorrelationId = perCorrelationIds.get(correlationId);