WCF code now compiles successfully. If I've followed the logic correctly there should be no behavioural changes, but I haven't the foggiest idea how to test it

Author: David R. MacIver

projects/wcf/RabbitMQ.ServiceModel/src/serviceModel/RabbitMQTransportBindingElement.cs

@@ -74,26 +74,23 @@ namespace RabbitMQ.ServiceModel
     /// </summary>
     public sealed class RabbitMQTransportBindingElement : TransportBindingElement
     {
-        private Uri m_broker;
-        private IProtocol m_brokerProtocol;
         private ConnectionFactory m_connectionFactory;
         private IConnection m_connection;
+        private bool m_hasBroker = false;
 
         /// <summary>
         /// Creates a new instance of the RabbitMQTransportBindingElement Class using the default protocol.
         /// </summary>
         public RabbitMQTransportBindingElement()
         {
-            m_brokerProtocol = Protocols.DefaultProtocol;
             m_connectionFactory = new ConnectionFactory();
-            m_connection = null;
         }
 
         private RabbitMQTransportBindingElement(RabbitMQTransportBindingElement other)
             : this()
         {
-            m_brokerProtocol = other.m_brokerProtocol;
-            m_broker = other.Broker;
+            Broker = other.Broker;
+            BrokerProtocol = other.BrokerProtocol;
         }
 
 
@@ -130,8 +127,7 @@ public override BindingElement Clone()
         internal void EnsureConnectionAvailable()
         {
             if (m_connection == null) {
-                m_connection = m_connectionFactory.CreateConnection(BrokerProtocol, Broker.Host, Broker.Port);
-                //TODO: configure connection parameters
+                m_connection = m_connectionFactory.CreateConnection();
             }
         }
 
@@ -184,8 +180,23 @@ public override string Scheme
         [ConfigurationProperty("broker")]
         public Uri Broker
         {
-            get { return m_broker; }
-            set { m_broker = value; }
+            get 
+            { 
+                if(!m_hasBroker) return null;                
+                UriBuilder build = new UriBuilder();
+                build.Host = m_connectionFactory.HostName;
+                build.Port = m_connectionFactory.Port;
+                return build.Uri; 
+            }
+            set 
+            { 
+                if(value == null) m_hasBroker = false;
+                else 
+                {
+                    m_connectionFactory.HostName = value.Host;
+                    m_connectionFactory.Port = value.Port;  
+                }
+            }
         }
 
         /// <summary>
@@ -194,8 +205,8 @@ public Uri Broker
         /// </summary>
         public IProtocol BrokerProtocol
         {
-            get { return m_brokerProtocol; }
-            set { m_brokerProtocol = value; }
+            get { return m_connectionFactory.Protocol; }
+            set { m_connectionFactory.Protocol = value; }
         }
 
         public ConnectionFactory ConnectionFactory