summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRajith Muditha Attapattu <rajith@apache.org>2011-06-28 19:29:15 +0000
committerRajith Muditha Attapattu <rajith@apache.org>2011-06-28 19:29:15 +0000
commit4cb96ae92ae64cbd3605e7a19f7f9733bf2d719f (patch)
treedf9e0c0a5dc95000532537d2b595916bd506405c
parent353b60461c8c62bea3936c32696c7421b2b96fcb (diff)
downloadqpid-python-4cb96ae92ae64cbd3605e7a19f7f9733bf2d719f.tar.gz
Merge branch 'perf-tools' into trunk
Conflicts: qpid/java/tools/src/main/java/org/apache/qpid/tools/TestParams.java git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1140797 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/java/tools/src/main/java/org/apache/qpid/tools/TestParams.java12
1 files changed, 6 insertions, 6 deletions
diff --git a/qpid/java/tools/src/main/java/org/apache/qpid/tools/TestParams.java b/qpid/java/tools/src/main/java/org/apache/qpid/tools/TestParams.java
index 70e94a2346..f03d5c1310 100644
--- a/qpid/java/tools/src/main/java/org/apache/qpid/tools/TestParams.java
+++ b/qpid/java/tools/src/main/java/org/apache/qpid/tools/TestParams.java
@@ -25,18 +25,18 @@ import javax.jms.Session;
public class TestParams
{
/*
- * By default the connection URL is used.
+ * By default the connection URL is used.
* This allows a user to easily specify a fully fledged URL any given property.
* Ex. SSL parameters
- *
+ *
* By providing a host & port allows a user to simply override the URL.
* This allows to create multiple clients in test scripts easily,
- * without having to deal with the long URL format.
+ * without having to deal with the long URL format.
*/
private String url = "amqp://guest:guest@clientid/testpath?brokerlist='tcp://localhost:5672'";
-
+
private String host = "";
-
+
private int port = -1;
private String address = "queue; {create : always}";
@@ -65,7 +65,7 @@ public class TestParams
private boolean random_msg_size = false;
- private String msgType = "byte";
+ private String msgType = "bytes";
public TestParams()
{