fixing access to ConnectionFactory.DEFAULT_CLIENT_PROPERTIES - replaced with ConnectionFactory.getDefaultClientProperties() static function; fixing access to AMQConnection._clientProperties

Author: Vlad Ionescu

src/com/rabbitmq/client/Connection.java

@@ -91,9 +91,9 @@ public interface Connection extends ShutdownNotifier { // rename to AMQPConnecti
     int getHeartbeat();
 
     /**
-     * Get the map of client properties sent to the server
+     * Get a copy of the map of client properties sent to the server
      *
-     * @return map of client properties
+     * @return a copy of the map of client properties
      */
     Map<String, Object> getClientProperties();
 

src/com/rabbitmq/client/ConnectionFactory.java

@@ -73,10 +73,6 @@ public class ConnectionFactory implements Cloneable {
     /** Default value for desired heartbeat interval; zero for none */
     public static final int DEFAULT_HEARTBEAT = 0;
 
-    /** Default extra client properties to be sent to the server */
-    public static final Map<String, Object> DEFAULT_CLIENT_PROPERTIES =
-            new HashMap<String, Object>();
-
     /** The default host to connect to */
     public static final String DEFAULT_HOST = "localhost";
 
@@ -102,7 +98,7 @@ public class ConnectionFactory implements Cloneable {
     private int requestedChannelMax               = DEFAULT_CHANNEL_MAX;
     private int requestedFrameMax                 = DEFAULT_FRAME_MAX;
     private int requestedHeartbeat                = DEFAULT_HEARTBEAT;
-    private Map<String, Object> _clientProperties = DEFAULT_CLIENT_PROPERTIES;
+    private Map<String, Object> _clientProperties = getDefaultClientProperties();
     private SocketFactory factory                 = SocketFactory.getDefault();
 
     /**
@@ -241,6 +237,15 @@ public void setRequestedHeartbeat(int requestedHeartbeat) {
         this.requestedHeartbeat = requestedHeartbeat;
     }
 
+    /**
+     * Retrieve the default table of extra client properties to be sent to the
+     * server.
+     * @return the map of extra client properties
+     */
+    public static Map<String, Object> getDefaultClientProperties() {
+        return new HashMap<String, Object>();
+    }
+
     /**
      * Retrieve the map of extra client properties to be sent to the server
      * @return the map of extra client properties

src/com/rabbitmq/client/impl/AMQConnection.java

@@ -35,6 +35,7 @@
 import java.io.IOException;
 import java.net.SocketException;
 import java.util.Map;
+import java.util.HashMap;
 import java.util.concurrent.TimeoutException;
 
 import com.rabbitmq.client.AMQP;
@@ -365,7 +366,7 @@ public void setHeartbeat(int heartbeat) {
     }
 
     public Map<String, Object> getClientProperties() {
-        return _clientProperties;
+        return new HashMap<String, Object>(_clientProperties);
     }
 
     /**