merge default into bug26133

Author: michaelklishin

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

@@ -203,118 +203,36 @@ public String Uri
         ///their respective defaults.</summary>
         public ConnectionFactory() { }
 
-        protected virtual IConnection FollowRedirectChain
-            (int maxRedirects,
-             IDictionary<AmqpTcpEndpoint, int> connectionAttempts,
-             IDictionary<AmqpTcpEndpoint, Exception> connectionErrors,
-             ref AmqpTcpEndpoint[] mostRecentKnownHosts,
-             AmqpTcpEndpoint endpoint)
+        ///<summary>Create a connection to the specified endpoint
+        ///No broker-originated redirects are permitted.</summary>
+        public virtual IConnection CreateConnection()
         {
-            AmqpTcpEndpoint candidate = endpoint;
-            try {
-                while (true) {
-                    int attemptCount =
-                        connectionAttempts.ContainsKey(candidate)
-                        ? (int) connectionAttempts[candidate]
-                        : 0;
-                    connectionAttempts[candidate] = attemptCount + 1;
-                    bool insist = attemptCount >= maxRedirects;
-
-                    IProtocol p = Protocol;
-                    IFrameHandler fh = p.CreateFrameHandler(candidate,
-                                                            SocketFactory,
-                                                            RequestedConnectionTimeout);
-
-                    // At this point, we may be able to create
-                    // and fully open a successful connection,
-                    // in which case we're done, and the
-                    // connection should be returned.
-                    return p.CreateConnection(this, insist, fh);
-                }
-            } catch (Exception e) {
-                connectionErrors[candidate] = e;
-                return null;
-            }
-        }
+            IDictionary<AmqpTcpEndpoint, int> attempts = new Dictionary<AmqpTcpEndpoint, int>();
+            Dictionary<AmqpTcpEndpoint, Exception> errors = new Dictionary<AmqpTcpEndpoint, Exception>();
 
-        protected virtual IConnection CreateConnection(int maxRedirects,
-                                                       IDictionary<AmqpTcpEndpoint, int> connectionAttempts,
-                                                       IDictionary<AmqpTcpEndpoint, Exception> connectionErrors,
-                                                       params AmqpTcpEndpoint[] endpoints)
-        {
-            foreach (AmqpTcpEndpoint endpoint in endpoints)
+            IConnection conn = null;
+            try
+            {
+                IProtocol p = Protocols.DefaultProtocol;
+                IFrameHandler fh = p.CreateFrameHandler(Endpoint,
+                                                                        SocketFactory,
+                                                                        RequestedConnectionTimeout);
+                conn = p.CreateConnection(this, false, fh);
+                attempts[Endpoint] = 1;
+            } catch (Exception e)
             {
-                AmqpTcpEndpoint[] mostRecentKnownHosts = new AmqpTcpEndpoint[0];
-                // ^^ holds a list of known-hosts that came back with
-                // a connection.redirect. If, once we reach the end of
-                // a chain of redirects, we still haven't managed to
-                // get a usable connection, we recurse on
-                // mostRecentKnownHosts, trying each of those in
-                // turn. Finally, if neither the initial
-                // chain-of-redirects for the current endpoint, nor
-                // the chains-of-redirects for each of the
-                // mostRecentKnownHosts gives us a usable connection,
-                // we give up on this particular endpoint, and
-                // continue with the foreach loop, trying the
-                // remainder of the array we were given.
-                IConnection conn = FollowRedirectChain(maxRedirects,
-                                                       connectionAttempts,
-                                                       connectionErrors,
-                                                       ref mostRecentKnownHosts,
-                                                       endpoint);
-                if (conn != null) {
-                    return conn;
-                }
 
-                // Connection to this endpoint failed at some point
-                // down the redirection chain - either the first
-                // entry, or one of the re.Host values from subsequent
-                // RedirectExceptions. We recurse into
-                // mostRecentKnownHosts, to see if one of those is
-                // suitable.
-                if (mostRecentKnownHosts.Length > 0) {
-                    // Only bother recursing if we know of some
-                    // hosts. If we were to recurse with no endpoints
-                    // in the array, we'd stomp on
-                    // mostRecentException, which makes debugging
-                    // connectivity problems needlessly more
-                    // difficult.
-                    conn = CreateConnection(maxRedirects,
-                                            connectionAttempts,
-                                            connectionErrors,
-                                            mostRecentKnownHosts);
-                    if (conn != null) {
-                        return conn;
-                    }
-                }
+                errors[Endpoint] = e;
             }
-            return null;
-        }
 
-        ///<summary>Create a connection to the first available
-        ///endpoint in the list provided. Up to a maximum of
-        ///maxRedirects broker-originated redirects are permitted for
-        ///each endpoint tried.</summary>
-        public virtual IConnection CreateConnection(int maxRedirects)
-        {
-            IDictionary<AmqpTcpEndpoint, int> connectionAttempts = new Dictionary<AmqpTcpEndpoint, int>();
-            Dictionary<AmqpTcpEndpoint, Exception> connectionErrors = new Dictionary<AmqpTcpEndpoint, Exception>();
-            IConnection conn = CreateConnection(maxRedirects,
-                                                connectionAttempts,
-                                                connectionErrors,
-                                                new AmqpTcpEndpoint[]{Endpoint});
-            if (conn != null) {
+            if(conn != null)
+            {
                 return conn;
+            } else
+            {
+                Exception cause = errors[Endpoint] as Exception;
+                throw new BrokerUnreachableException(attempts, errors, cause);
             }
-            Exception Inner = connectionErrors[Endpoint] as Exception;
-            throw new BrokerUnreachableException(connectionAttempts, connectionErrors, Inner);
-        }
-
-        ///<summary>Create a connection to the specified endpoint
-        ///No broker-originated redirects are permitted.</summary>
-        public virtual IConnection CreateConnection()
-        {
-            return CreateConnection(0);
         }
 
         ///<summary>Given a list of mechanism names supported by the

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

@@ -928,13 +928,6 @@ void _Private_ConnectionOpen(string virtualHost,
         void HandleConnectionOpenOk([AmqpFieldMapping("RabbitMQ.Client.Framing.v0_9_1", "reserved1")]
                                     string knownHosts);
 
-        ///<summary>Handle an incoming Connection.Redirect.
-        /// (not available in AMQP 0-9-1)
-        ///</summary>
-        [AmqpMethodDoNotImplement("RabbitMQ.Client.Framing.v0_9_1")]
-        void HandleConnectionRedirect(string host,
-                                      string knownHosts);
-
         ///<summary>Used to send a Connection.Close. Called during
         ///connection shutdown.</summary>
         [AmqpMethodMapping(null, "connection", "close")]

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

@@ -1507,16 +1507,6 @@ public void HandleConnectionOpenOk(string knownHosts)
             k.HandleCommand(null); // release the continuation.
         }
 
-        public void HandleConnectionRedirect(string host,
-                                             string knownHosts)
-        {
-            ConnectionOpenContinuation k = (ConnectionOpenContinuation)m_continuationQueue.Next();
-            k.m_redirect = true;
-            k.m_host = host;
-            k.m_knownHosts = knownHosts;
-            k.HandleCommand(null); // release the continuation.
-        }
-
         public abstract void _Private_ConnectionClose(ushort replyCode,
                                                       string replyText,
                                                       ushort classId,