Merging bug 22405 onto default

Author: Matthew Sackman

src/com/rabbitmq/client/ConnectionFactory.java

@@ -52,7 +52,7 @@
  * Convenience "factory" class to facilitate opening a {@link Connection} to an AMQP broker.
  */
 
-public class ConnectionFactory {
+public class ConnectionFactory implements Cloneable {
     /** Default user name */
     public static final String DEFAULT_USER = "guest";
 
@@ -399,4 +399,13 @@ public Connection newConnection() throws IOException {
                              0,
                              new HashMap<Address,Integer>());
     }
+
+
+    @Override public ConnectionFactory clone(){
+        try {
+            return (ConnectionFactory)super.clone(); 
+        } catch (CloneNotSupportedException e) {
+            throw new Error(e);
+        }
+    }
 }

test/src/com/rabbitmq/client/test/functional/BindingLifecycleBase.java

@@ -38,6 +38,7 @@
 import com.rabbitmq.client.Connection;
 import com.rabbitmq.client.GetResponse;
 import com.rabbitmq.client.QueueingConsumer;
+import com.rabbitmq.client.ConnectionFactory;
 import java.io.IOException;
 
 /**
@@ -75,9 +76,10 @@ public void openConnection() throws IOException {
     super.openConnection();
     if (secondaryConnection == null) {
       try {
-        connectionFactory.setHost("localhost");
-        connectionFactory.setPort(5673);
-        secondaryConnection = connectionFactory.newConnection();
+        ConnectionFactory cf2 = connectionFactory.clone();
+        cf2.setHost("localhost");
+        cf2.setPort(5673);
+        secondaryConnection = cf2.newConnection();
       }
       catch (IOException e) {
       }