merge bug19322 into default

Author: tonyg

test/src/com/rabbitmq/examples/ManyConnections.java

@@ -28,33 +28,39 @@
 import com.rabbitmq.client.AMQP;
 import com.rabbitmq.client.Channel;
 import com.rabbitmq.client.ConnectionFactory;
+import com.rabbitmq.client.ConnectionParameters;
 import com.rabbitmq.client.Connection;
 import com.rabbitmq.client.QueueingConsumer;
 
 public class ManyConnections {
     public static double rate;
     public static int connectionCount;
     public static int channelPerConnectionCount;
+    public static int heartbeatInterval;
 
     public static int totalCount() {
 	return connectionCount * channelPerConnectionCount;
     }
 
     public static void main(String[] args) {
         try {
-	    if (args.length < 3) {
-		System.err.println("Usage: ManyConnections hostName connCount chanPerConnCount [rate [port]]");
+	    if (args.length < 4) {
+		System.err.println("Usage: ManyConnections hostName connCount chanPerConnCount heartbeatInterval [rate [port]]");
 		System.exit(2);
 	    }
 
             String hostName = args[0];
 	    connectionCount = Integer.parseInt(args[1]);
 	    channelPerConnectionCount = Integer.parseInt(args[2]);
-	    rate = (args.length > 3) ? Double.parseDouble(args[3]) : 1.0;
-            int portNumber = (args.length > 4) ? Integer.parseInt(args[4]) : AMQP.PROTOCOL.PORT;
+            heartbeatInterval = Integer.parseInt(args[3]);
+	    rate = (args.length > 4) ? Double.parseDouble(args[4]) : 1.0;
+            int portNumber = (args.length > 5) ? Integer.parseInt(args[5]) : AMQP.PROTOCOL.PORT;
 
+            ConnectionParameters params = new ConnectionParameters();
+            params.setRequestedHeartbeat(heartbeatInterval);
 	    for (int i = 0; i < connectionCount; i++) {
-		final Connection conn = new ConnectionFactory().newConnection(hostName, portNumber);
+                System.out.println("Starting connection "+i);
+		final Connection conn = new ConnectionFactory(params).newConnection(hostName, portNumber);
 
 		for (int j = 0; j < channelPerConnectionCount; j++) {
 		    final Channel ch = conn.createChannel();