Donaldhan
diff --git a/‎src/com/rabbitmq/client/Connection.java
Lines changed: 7 additions & 0 deletions b/‎src/com/rabbitmq/client/Connection.java
Lines changed: 7 additions & 0 deletions
diff --git a/‎src/com/rabbitmq/client/ConnectionFactory.java
Lines changed: 65 additions & 1 deletion b/‎src/com/rabbitmq/client/ConnectionFactory.java
Lines changed: 65 additions & 1 deletion
diff --git a/‎src/com/rabbitmq/client/impl/AMQConnection.java
Lines changed: 9 additions & 0 deletions b/‎src/com/rabbitmq/client/impl/AMQConnection.java
Lines changed: 9 additions & 0 deletions
diff --git a/‎src/com/rabbitmq/client/impl/recovery/AutorecoveringConnection.java
Lines changed: 7 additions & 0 deletions b/‎src/com/rabbitmq/client/impl/recovery/AutorecoveringConnection.java
Lines changed: 7 additions & 0 deletions
@@ -93,6 +93,13 @@ public interface Connection extends ShutdownNotifier { // rename to AMQPConnecti
      */
     Map<String, Object> getClientProperties();
 
+    /**
+     * Get connection name client property value
+     *
+     * @return string connection name from client properties, or null if there is not such property.
+     */
+    String getConnectionName();
+
     /**
      * Retrieve the server properties.
      * @return a map of the server properties. This typically includes the product name and version of the server.
 
@@ -21,6 +21,7 @@
 import java.security.NoSuchAlgorithmException;
 import java.util.Collections;
 import java.util.Map;
+import java.util.HashMap;
 import java.util.concurrent.*;
 import java.util.List;
 import java.util.Arrays;
@@ -647,6 +648,20 @@ public Connection newConnection(Address[] addrs) throws IOException, TimeoutExce
         return newConnection(this.sharedExecutor, Arrays.asList(addrs), null);
     }
 
+
+    /**
+     * Create a new broker connection, picking the first available address from
+     * the list.
+     *
+     * If <a href="http://www.rabbitmq.com/api-guide.html#recovery">automatic connection recovery</a>
+     * is enabled, the connection returned by this method will be {@link Recoverable}. Future
+     * reconnection attempts will pick a random accessible address from the provided list.
+     *
+     * @param addrs an array of known broker addresses (hostname/port pairs) to try in order
+     * @param connectionName arbitrary sring for connection name client property
+     * @return an interface to the connection
+     * @throws IOException if it encounters a problem
+     */
     public Connection newConnection(Address[] addrs, String connectionName) throws IOException, TimeoutException {
         return newConnection(this.sharedExecutor, Arrays.asList(addrs), connectionName);
     }
@@ -667,6 +682,19 @@ public Connection newConnection(List<Address> addrs) throws IOException, Timeout
         return newConnection(this.sharedExecutor, addrs, null);
     }
 
+    /**
+     * Create a new broker connection, picking the first available address from
+     * the list.
+     *
+     * If <a href="http://www.rabbitmq.com/api-guide.html#recovery">automatic connection recovery</a>
+     * is enabled, the connection returned by this method will be {@link Recoverable}. Future
+     * reconnection attempts will pick a random accessible address from the provided list.
+     *
+     * @param addrs a List of known broker addresses (hostname/port pairs) to try in order
+     * @param connectionName arbitrary sring for connection name client property
+     * @return an interface to the connection
+     * @throws IOException if it encounters a problem
+     */
     public Connection newConnection(List<Address> addrs, String connectionName) throws IOException, TimeoutException {
         return newConnection(this.sharedExecutor, addrs, connectionName);
     }
@@ -689,6 +717,22 @@ public Connection newConnection(ExecutorService executor, Address[] addrs) throw
         return newConnection(executor, Arrays.asList(addrs), null);
     }
 
+
+    /**
+     * Create a new broker connection, picking the first available address from
+     * the list.
+     *
+     * If <a href="http://www.rabbitmq.com/api-guide.html#recovery">automatic connection recovery</a>
+     * is enabled, the connection returned by this method will be {@link Recoverable}. Future
+     * reconnection attempts will pick a random accessible address from the provided list.
+     *
+     * @param executor thread execution service for consumers on the connection
+     * @param addrs an array of known broker addresses (hostname/port pairs) to try in order
+     * @param connectionName arbitrary sring for connection name client property
+     * @return an interface to the connection
+     * @throws java.io.IOException if it encounters a problem
+     * @see <a href="http://www.rabbitmq.com/api-guide.html#recovery">Automatic Recovery</a>
+     */
     public Connection newConnection(ExecutorService executor, Address[] addrs, String connectionName) throws IOException, TimeoutException {
         return newConnection(executor, Arrays.asList(addrs), connectionName);
     }
@@ -707,13 +751,33 @@ public Connection newConnection(ExecutorService executor, Address[] addrs, Strin
      * @throws java.io.IOException if it encounters a problem
      * @see <a href="http://www.rabbitmq.com/api-guide.html#recovery">Automatic Recovery</a>
      */
+    public Connection newConnection(ExecutorService executor, List<Address> addrs) throws IOException, TimeoutException {
+        return newConnection(executor, addrs, null);
+    }
+
+    /**
+     * Create a new broker connection, picking the first available address from
+     * the list.
+     *
+     * If <a href="http://www.rabbitmq.com/api-guide.html#recovery">automatic connection recovery</a>
+     * is enabled, the connection returned by this method will be {@link Recoverable}. Future
+     * reconnection attempts will pick a random accessible address from the provided list.
+     *
+     * @param executor thread execution service for consumers on the connection
+     * @param addrs a List of known broker addrs (hostname/port pairs) to try in order
+     * @param connectionName arbitrary sring for connection name client property
+     * @return an interface to the connection
+     * @throws java.io.IOException if it encounters a problem
+     * @see <a href="http://www.rabbitmq.com/api-guide.html#recovery">Automatic Recovery</a>
+     */
     public Connection newConnection(ExecutorService executor, List<Address> addrs, String connectionName)
             throws IOException, TimeoutException {
         // make sure we respect the provided thread factory
         FrameHandlerFactory fhFactory = createFrameHandlerFactory();
         ConnectionParams params = params(executor);
+        // set connection name client property
         if (connectionName != null) {
-            Map<String, Object> properties = params.getClientProperties().clone();
+            Map<String, Object> properties = new HashMap<String, Object>(params.getClientProperties());
             properties.put("connection_name", connectionName);
             params.setClientProperties(properties);
         }
 
@@ -470,6 +470,15 @@ public Map<String, Object> getClientProperties() {
         return new HashMap<String, Object>(_clientProperties);
     }
 
+    public String getConnectionName() {
+        Object connectionName = _clientProperties.get("connection_name");
+        if (connectionName == null){
+            return null;
+        } else {
+            return connectionName.toString();
+        }
+    }
+
     /**
      * Protected API - retrieve the current ExceptionHandler
      */
 
@@ -156,6 +156,13 @@ public Map<String, Object> getClientProperties() {
         return delegate.getClientProperties();
     }
 
+    /**
+     * @see com.rabbitmq.client.Connection#getConnectionName()
+     */
+    public String getConnectionName() {
+        return delegate.getConnectionName();
+    }
+
     /**
      * @see com.rabbitmq.client.Connection#getFrameMax()
      */