fixing access to ConnectionFactory.DefaultClientProperties; fixing access to ConnectionBase.ClientProperties

Author: Vlad Ionescu

projects/client/RabbitMQ.Client/src/client/api/ConnectionFactory.cs

@@ -126,10 +126,6 @@ public class ConnectionFactory
         /// seconds, with zero meaning none (value: 0)</summary>
         public const ushort DefaultHeartbeat = 0; // PLEASE KEEP THIS MATCHING THE DOC ABOVE
 
-        /// <summary>Default value for extra client properties to be sent to
-        /// the server (value: empty Hashtable)
-        public static readonly IDictionary DefaultClientProperties = new Hashtable(); // PLEASE KEEP THIS MATCHING THE DOC ABOVE
-
         /// <summary>Username to use when authenticating to the server</summary>
         public string UserName = DefaultUser;
 
@@ -165,6 +161,16 @@ public class ConnectionFactory
         ///<summary>The AMQP protocol to be used</summary>
         public IProtocol Protocol = Protocols.FromEnvironment();
 
+        /// <summary>Default value for extra client properties to be sent to
+        /// the server (value: empty Hashtable)</summary>
+        public static IDictionary DefaultClientProperties
+        {
+            get
+            {
+                return new Hashtable(); // PLEASE KEEP THIS MATCHING THE DOC ABOVE
+            }
+        }
+
         public AmqpTcpEndpoint Endpoint
         { 
           get

projects/client/RabbitMQ.Client/src/client/api/IConnection.cs

@@ -116,7 +116,7 @@ public interface IConnection: IDisposable
         ///(0 for disabled), in seconds.</summary>
         ushort Heartbeat { get; }
 
-        ///<summary>The client properties that has been sent to the
+        ///<summary>A copy of the client properties that has been sent to the
         ///server.</summary>
         IDictionary ClientProperties { get; }
 

projects/client/RabbitMQ.Client/src/client/impl/ConnectionBase.cs

@@ -255,7 +255,7 @@ public IDictionary ClientProperties
         {
             get
             {
-                return m_clientProperties;
+                return new Hashtable(m_clientProperties);
             }
             set
             {
@@ -973,12 +973,12 @@ public void Open(bool insist)
                                                            serverVersion.Minor);
             }
 
-            ClientProperties = BuildClientPropertiesTable(m_factory.ClientProperties);
+            m_clientProperties = BuildClientPropertiesTable(m_factory.ClientProperties);
 
             // FIXME: check that PLAIN is supported.
             // FIXME: parse out locales properly!
             ConnectionTuneDetails connectionTune =
-                m_model0.ConnectionStartOk(ClientProperties,
+                m_model0.ConnectionStartOk(m_clientProperties,
                                            "PLAIN",
                                            Encoding.UTF8.GetBytes("\0" + m_factory.UserName +
                                                                   "\0" + m_factory.Password),