summaryrefslogtreecommitdiff
path: root/qpid/java/tools
diff options
context:
space:
mode:
Diffstat (limited to 'qpid/java/tools')
-rw-r--r--qpid/java/tools/bin/qpid-bench1
-rw-r--r--qpid/java/tools/src/main/java/org/apache/qpid/tools/QpidBench.java15
2 files changed, 6 insertions, 10 deletions
diff --git a/qpid/java/tools/bin/qpid-bench b/qpid/java/tools/bin/qpid-bench
index a4c8c774b4..21b092563a 100644
--- a/qpid/java/tools/bin/qpid-bench
+++ b/qpid/java/tools/bin/qpid-bench
@@ -30,7 +30,6 @@ QPID_LIBS=$QPID_HOME/lib/qpid-incubating.jar
export JAVA=java \
JAVA_VM=-server \
JAVA_MEM=-Xmx1024m \
- JAVA_GC="-XX:+UseConcMarkSweepGC -XX:+HeapDumpOnOutOfMemoryError" \
QPID_CLASSPATH=$QPID_LIBS
. qpid-run org.apache.qpid.tools.QpidBench "$@"
diff --git a/qpid/java/tools/src/main/java/org/apache/qpid/tools/QpidBench.java b/qpid/java/tools/src/main/java/org/apache/qpid/tools/QpidBench.java
index 9115a72068..377df17277 100644
--- a/qpid/java/tools/src/main/java/org/apache/qpid/tools/QpidBench.java
+++ b/qpid/java/tools/src/main/java/org/apache/qpid/tools/QpidBench.java
@@ -524,7 +524,7 @@ public class QpidBench
StringBuilder str = new StringBuilder();
for (int i = 0; i < opts.size; i++)
{
- str.append((char) i);
+ str.append((char) (i % 128));
}
String body = str.toString();
@@ -782,10 +782,8 @@ public class QpidBench
dp.setTimestamp(System.currentTimeMillis());
}
- ssn.messageTransfer("amq.direct", MessageAcceptMode.NONE, MessageAcquireMode.PRE_ACQUIRED);
- ssn.header(dp, mp);
- ssn.data(body.slice());
- ssn.endData();
+ ssn.messageTransfer("amq.direct", MessageAcceptMode.NONE, MessageAcquireMode.PRE_ACQUIRED,
+ new Header(dp, mp), body.slice());
count++;
}
@@ -827,10 +825,9 @@ public class QpidBench
{
ssn.messageTransfer("amq.direct",
MessageAcceptMode.NONE,
- MessageAcquireMode.PRE_ACQUIRED);
- ssn.header(dp, mp);
- ssn.data(echo);
- ssn.endData();
+ MessageAcquireMode.PRE_ACQUIRED,
+ new Header(dp, mp),
+ echo);
}
if (sample)