merge bug26131 into bug26133

Author: michaelklishin

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

@@ -45,8 +45,7 @@
 
 namespace RabbitMQ.Client
 {
-    ///<summary>Represents a TCP-addressable AMQP peer, including the
-    ///protocol variant to use, and a host name and port
+    ///<summary>Represents a TCP-addressable AMQP peer: a host name and port
     ///number.</summary>
     ///<para>
     /// Some of the constructors take, as a convenience, a System.Uri
@@ -62,12 +61,10 @@ public class AmqpTcpEndpoint
         public const int DefaultAmqpSslPort = 5671;
         public const int UseDefaultPort = -1;
 
-        private IProtocol m_protocol;
-        ///<summary>Retrieve or set the IProtocol of this AmqpTcpEndpoint.</summary>
+        ///<summary>Retrieve IProtocol of this AmqpTcpEndpoint.</summary>
         public IProtocol Protocol
         {
-            get { return m_protocol; }
-            set { m_protocol = value; }
+            get { return Protocols.DefaultProtocol; }
         }
 
         private string m_hostName;
@@ -81,15 +78,15 @@ public string HostName
         private int m_port;
         ///<summary>Retrieve or set the port number of this
         ///AmqpTcpEndpoint. A port number of -1 causes the default
-        ///port number for the IProtocol to be used.</summary>
+        ///port number.</summary>
         public int Port
         {
             get {
                 if (m_port != UseDefaultPort)
                     return m_port;
                 if (m_ssl.Enabled)
                     return DefaultAmqpSslPort;
-                return m_protocol.DefaultPort;
+                return Protocol.DefaultPort;
             }
             set { m_port = value; }
         }
@@ -105,100 +102,56 @@ public SslOption Ssl
         }
 
         ///<summary>Construct an AmqpTcpEndpoint with the given
-        ///IProtocol, hostname, port number and ssl option. If the port
-        ///number is -1, the default port number for the IProtocol
-        ///will be used.</summary>
-        public AmqpTcpEndpoint(IProtocol protocol, string hostName, int portOrMinusOne, SslOption ssl)
+        ///hostname, port number and ssl option. If the port
+        ///number is -1, the default port number will be used.</summary>
+        public AmqpTcpEndpoint(string hostName, int portOrMinusOne, SslOption ssl)
         {
-            m_protocol = protocol;
             m_hostName = hostName;
             m_port = portOrMinusOne;
             m_ssl = ssl;
         }
 
         ///<summary>Construct an AmqpTcpEndpoint with the given
-        ///IProtocol, hostname, and port number. If the port number is
-        ///-1, the default port number for the IProtocol will be
-        ///used.</summary>
-        public AmqpTcpEndpoint(IProtocol protocol, string hostName, int portOrMinusOne) :
-            this(protocol, hostName, portOrMinusOne, new SslOption())
-        {
-        }
-
-        ///<summary>Construct an AmqpTcpEndpoint with the given
-        ///IProtocol and hostname, using the default port for the
-        ///IProtocol.</summary>
-        public AmqpTcpEndpoint(IProtocol protocol, string hostName) :
-            this(protocol, hostName, -1)
-        {
-        }
-
-        ///<summary>Construct an AmqpTcpEndpoint with the given
-        ///IProtocol, "localhost" as the hostname, and using the
-        ///default port for the IProtocol.</summary>
-        public AmqpTcpEndpoint(IProtocol protocol) :
-            this(protocol, "localhost", -1)
-        {
-        }
-
-        ///<summary>Construct an AmqpTcpEndpoint with the given
-        ///hostname and port number, using Protocols.DefaultProtocol. If the port number is
-        ///-1, the default port number for the IProtocol will be
+        ///hostname, and port number. If the port number is
+        ///-1, the default port number will be
         ///used.</summary>
         public AmqpTcpEndpoint(string hostName, int portOrMinusOne) :
-            this(Protocols.DefaultProtocol, hostName, portOrMinusOne)
+            this(hostName, portOrMinusOne, new SslOption())
         {
         }
 
         ///<summary>Construct an AmqpTcpEndpoint with the given
-        ///hostname, using the IProtocol from
-        ///Protocols.DefaultProtocol, and the default port number of
-        ///that IProtocol.</summary>
+        ///hostname, using the default port.</summary>
         public AmqpTcpEndpoint(string hostName) :
-            this(Protocols.DefaultProtocol, hostName)
+            this(hostName, -1)
         {
         }
 
-        ///<summary>Construct an AmqpTcpEndpoint with a hostname of
-        ///"localhost", using the IProtocol from
-        ///Protocols.DefaultProtocol, and the default port number of
-        ///that IProtocol.</summary>
+        ///<summary>Construct an AmqpTcpEndpoint with "localhost" as
+        ///the hostname, and using the default port.</summary>
         public AmqpTcpEndpoint() :
-            this(Protocols.DefaultProtocol)
+            this("localhost", -1)
         {
         }
 
         ///<summary>Construct an AmqpTcpEndpoint with the given
-        ///IProtocol, Uri and ssl options.</summary>
+        ///Uri and ssl options.</summary>
         ///<remarks>
         /// Please see the class overview documentation for
         /// information about the Uri format in use.
         ///</remarks>
-        public AmqpTcpEndpoint(IProtocol protocol, Uri uri, SslOption ssl) :
-            this(protocol, uri.Host, uri.Port, ssl)
+        public AmqpTcpEndpoint(Uri uri, SslOption ssl) :
+            this(uri.Host, uri.Port, ssl)
         {
         }
 
-        ///<summary>Construct an AmqpTcpEndpoint with the given
-        ///IProtocol and Uri.</summary>
-        ///<remarks>
-        /// Please see the class overview documentation for
-        /// information about the Uri format in use.
-        ///</remarks>
-        public AmqpTcpEndpoint(IProtocol protocol, Uri uri) :
-            this(protocol, uri.Host, uri.Port)
-        {
-        }
-
-        ///<summary>Construct an AmqpTcpEndpoint with the given
-        ///Uri, using the IProtocol from
-        ///Protocols.DefaultProtocol.</summary>
+        ///<summary>Construct an AmqpTcpEndpoint with the given Uri.</summary>
         ///<remarks>
         /// Please see the class overview documentation for
         /// information about the Uri format in use.
         ///</remarks>
         public AmqpTcpEndpoint(Uri uri) :
-            this(Protocols.DefaultProtocol, uri)
+            this(uri.Host, uri.Port)
         {
         }
 
@@ -209,7 +162,7 @@ public AmqpTcpEndpoint(Uri uri) :
         ///</remarks>
         public override string ToString()
         {
-            return "amqp-" + Protocol + "://" + HostName + ":" + Port;
+            return "amqp://" + HostName + ":" + Port;
         }
 
         ///<summary>Compares this instance by value (protocol,
@@ -218,7 +171,6 @@ public override bool Equals(object obj)
         {
             AmqpTcpEndpoint other = obj as AmqpTcpEndpoint;
             if (other == null) return false;
-            if (other.Protocol != Protocol) return false;
             if (other.HostName != HostName) return false;
             if (other.Port != Port) return false;
             return true;
@@ -230,7 +182,6 @@ public override bool Equals(object obj)
         public override int GetHashCode()
         {
             return
-                Protocol.GetHashCode() ^
                 HostName.GetHashCode() ^
                 Port;
         }
@@ -245,7 +196,7 @@ public override int GetHashCode()
         /// variant specified).
         /// Hostnames provided as IPv6 must appear in square brackets ([]).
         ///</remarks>
-        public static AmqpTcpEndpoint Parse(IProtocol protocol, string address) {
+        public static AmqpTcpEndpoint Parse(string address) {
             Match match = Regex.Match(address, @"^\s*\[([%:0-9A-Fa-f]+)\](:(.*))?\s*$");
             if (match.Success)
             {
@@ -256,18 +207,16 @@ public static AmqpTcpEndpoint Parse(IProtocol protocol, string address) {
                     string portStr = groups[3].Value;
                     portNum = (portStr.Length == 0) ? -1 : int.Parse(portStr);
                 }
-                return new AmqpTcpEndpoint(protocol,
-                                           match.Groups[1].Value,
+                return new AmqpTcpEndpoint(match.Groups[1].Value,
                                            portNum);
             }
             int index = address.LastIndexOf(':');
             if (index == -1) {
-                return new AmqpTcpEndpoint(protocol, address, -1);
+                return new AmqpTcpEndpoint(address, -1);
             } else {
                 string portStr = address.Substring(index + 1).Trim();
                 int portNum = (portStr.Length == 0) ? -1 : int.Parse(portStr);
-                return new AmqpTcpEndpoint(protocol,
-                                           address.Substring(0, index),
+                return new AmqpTcpEndpoint(address.Substring(0, index),
                                            portNum);
             }
         }
@@ -280,13 +229,13 @@ public static AmqpTcpEndpoint Parse(IProtocol protocol, string address) {
         /// optional, and returns a corresponding array of
         /// AmqpTcpEndpoints.
         ///</remarks>
-        public static AmqpTcpEndpoint[] ParseMultiple(IProtocol protocol, string addresses) {
+        public static AmqpTcpEndpoint[] ParseMultiple(string addresses) {
             string[] partsArr = addresses.Split(new char[] { ',' });
             List<AmqpTcpEndpoint> results = new List<AmqpTcpEndpoint>();
             foreach (string partRaw in partsArr) {
                 string part = partRaw.Trim();
                 if (part.Length > 0) {
-                    results.Add(Parse(protocol, part));
+                    results.Add(Parse(part));
                 }
             }
             return results.ToArray();

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

@@ -172,11 +172,10 @@ public AmqpTcpEndpoint Endpoint
         {
           get
           {
-              return new AmqpTcpEndpoint(Protocol, HostName, Port, Ssl);
+              return new AmqpTcpEndpoint(HostName, Port, Ssl);
           }
           set
           {
-              Protocol = value.Protocol;
               Port = value.Port;
               HostName = value.HostName;
               Ssl = value.Ssl;
@@ -214,7 +213,7 @@ public virtual IConnection CreateConnection()
             IConnection conn = null;
             try
             {
-                IProtocol p = Endpoint.Protocol;
+                IProtocol p = Protocols.DefaultProtocol;
                 IFrameHandler fh = p.CreateFrameHandler(Endpoint,
                                                                         SocketFactory,
                                                                         RequestedConnectionTimeout);

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

@@ -1160,7 +1160,7 @@ public virtual void Open(bool insist)
             string knownHosts = m_model0.ConnectionOpen(m_factory.VirtualHost,
                                                         "", // FIXME: make configurable?
                                                         insist);
-            KnownHosts = AmqpTcpEndpoint.ParseMultiple(Protocol, knownHosts);
+            KnownHosts = AmqpTcpEndpoint.ParseMultiple(knownHosts);
         }
 
         public override string ToString()

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

@@ -1491,7 +1491,6 @@ public string ConnectionOpen(string virtualHost,
                 // negotiation finishes
             }
             k.GetReply();
-
             return k.m_knownHosts;
         }
 

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

@@ -144,10 +144,19 @@ public int Timeout
         {
             set
             {
-                if (m_socket.Connected)
+                try
+                {
+                    if (m_socket.Connected)
+                    {
+                        m_socket.ReceiveTimeout = value;
+                    }
+                }
+                #pragma warning disable 0168
+                catch (SocketException _)
                 {
-                    m_socket.ReceiveTimeout = value;
+                    // means that the socket is already closed
                 }
+                #pragma warning restore 0168
             }
         }