QPID-2421 : Update to expose the PingClient count so we can set the correlationID correctly for test with > 1 -c[] value.

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

2 files changed, 6 insertions, 1 deletions

diff --git a/java/perftests/src/main/java/org/apache/qpid/ping/PingClient.java b/java/perftests/src/main/java/org/apache/qpid/ping/PingClient.java
index 0afec83b19..dcfc67d4fc 100644
--- a/java/perftests/src/main/java/org/apache/qpid/ping/PingClient.java
+++ b/java/perftests/src/main/java/org/apache/qpid/ping/PingClient.java
@@ -104,4 +104,9 @@ public class PingClient extends PingPongProducer
             return _pingClientCount * _noOfConsumers;
         }
     }
+
+    public int getClientCount()
+    {
+        return _pingClientCount;
+    }
 }
diff --git a/java/perftests/src/main/java/org/apache/qpid/ping/PingTestPerf.java b/java/perftests/src/main/java/org/apache/qpid/ping/PingTestPerf.java
index 0f9603303b..4c5df0a471 100644
--- a/java/perftests/src/main/java/org/apache/qpid/ping/PingTestPerf.java
+++ b/java/perftests/src/main/java/org/apache/qpid/ping/PingTestPerf.java
@@ -148,7 +148,7 @@ public class PingTestPerf extends AsymptoticTestCase implements TestThreadAware
             {
                 // Manually set the correlation ID to 1. This is not ideal but it is the
                 // value that the main test loop will use.
-                perThreadSetup._pingClient.pingNoWaitForReply(null, preFill, "1");
+                perThreadSetup._pingClient.pingNoWaitForReply(null, preFill, String.valueOf(perThreadSetup._pingClient.getClientCount()));
 
                 // Note with a large preFill and non-tx session the messages will be
                 // rapidly pushed in to the mina buffers. OOM's are a real risk here.