Merge branch 'stable'

Author: michaelklishin

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

@@ -419,7 +419,9 @@ public IConnection CreateConnection(IList<string> hostnames, String clientProvid
                 else
                 {
                     IProtocol protocol = Protocols.DefaultProtocol;
-                    conn = protocol.CreateConnection(this, false, CreateFrameHandler(), clientProvidedName);
+                    var selectedHost = this.HostnameSelector.NextFrom(hostnames);
+                    var endPoint = AmqpTcpEndpoint.Parse(selectedHost);
+                    conn = protocol.CreateConnection(this, false, CreateFrameHandler(endPoint), clientProvidedName);
                 }
             }
             catch (Exception e)
@@ -445,9 +447,12 @@ public IFrameHandler CreateFrameHandler(AmqpTcpEndpoint endpoint)
 
         public IFrameHandler CreateFrameHandlerForHostname(string hostname)
         {
-            return CreateFrameHandler(this.Endpoint.CloneWithHostname(hostname));
+            var ep = AmqpTcpEndpoint.Parse(hostname);
+            ep.Ssl = this.Endpoint.Ssl;
+            return CreateFrameHandler(ep);
         }
 
+
         private IFrameHandler ConfigureFrameHandler(IFrameHandler fh)
         {
             // make sure socket timeouts are higher than heartbeat

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

@@ -562,9 +562,11 @@ public void Init(IList<string> hostnames)
             {
                 try
                 {
-                    fh = m_factory.CreateFrameHandler(m_factory.Endpoint.CloneWithHostname(h));
+                    var endPoint = CloneEndpointWithHostname(h);
+                    fh = m_factory.CreateFrameHandler(endPoint);
                     reachableHostname = h;
-                } catch (Exception caught)
+                } 
+                catch (Exception caught)
                 {
                     e = caught;
                 }
@@ -796,7 +798,8 @@ protected void RecoverConnectionDelegate()
                 try
                 {
                     var nextHostname = m_factory.HostnameSelector.NextFrom(this.hostnames);
-                    var fh = m_factory.CreateFrameHandler(m_factory.Endpoint.CloneWithHostname(nextHostname));
+                    var endPoint = CloneEndpointWithHostname(nextHostname);
+                    var fh = m_factory.CreateFrameHandler(endPoint);
                     m_delegate = new Connection(m_factory, false, fh, this.ClientProvidedName);
                     recovering = false;
                 }
@@ -1003,5 +1006,12 @@ protected bool ShouldTriggerConnectionRecovery(ShutdownEventArgs args)
                 // connectivity loss or abrupt shutdown
                     args.Initiator == ShutdownInitiator.Library);
         }
+
+        private AmqpTcpEndpoint CloneEndpointWithHostname(string hostname)
+        {
+            var ate = AmqpTcpEndpoint.Parse(hostname);
+            ate.Ssl = m_factory.Endpoint.Ssl;
+            return ate;
+        }
     }
 }

projects/client/Unit/src/unit/TestConnectionFactory.cs

@@ -68,5 +68,35 @@ public void TestProperties()
             Assert.AreEqual(cf.HostName, h);
             Assert.AreEqual(cf.Port, p);
         }
+
+        [Test]
+        public void TestCreateConnectionParsesHostNameWithPort()
+        {
+            var cf = new ConnectionFactory();
+            cf.AutomaticRecoveryEnabled = true;
+            cf.HostName = "not_localhost";
+            cf.Port = 1234;
+            var conn = cf.CreateConnection(new System.Collections.Generic.List<string> { "localhost:5672" }, "oregano");
+            conn.Close();
+            conn.Dispose();
+            Assert.AreEqual("not_localhost", cf.HostName);
+            Assert.AreEqual(1234, cf.Port);
+            Assert.AreEqual("localhost", conn.Endpoint.HostName);
+            Assert.AreEqual(5672, conn.Endpoint.Port);
+        }
+
+        [Test]
+        public void TestCreateConnectionWithoutAutoRecoverySelectsAHostFromTheList()
+        {
+            var cf = new ConnectionFactory();
+            cf.AutomaticRecoveryEnabled = false;
+            cf.HostName = "not_localhost";
+            cf.Port = 1234;
+            var conn = cf.CreateConnection(new System.Collections.Generic.List<string> { "localhost" }, "oregano");
+            conn.Close();
+            conn.Dispose();
+            Assert.AreEqual("not_localhost", cf.HostName);
+            Assert.AreEqual("localhost", conn.Endpoint.HostName);       
+	}
     }
 }