Remove re-connection attempts from BrokerUnreachableException

Author: michaelklishin

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

@@ -203,36 +203,24 @@ public String Uri
         ///their respective defaults.</summary>
         public ConnectionFactory() { }
 
-        ///<summary>Create a connection to the specified endpoint
-        ///No broker-originated redirects are permitted.</summary>
+        ///<summary>Create a connection to the specified endpoint.</summary>
         public virtual IConnection CreateConnection()
         {
-            IDictionary<AmqpTcpEndpoint, int> attempts = new Dictionary<AmqpTcpEndpoint, int>();
-            Dictionary<AmqpTcpEndpoint, Exception> errors = new Dictionary<AmqpTcpEndpoint, Exception>();
-
             IConnection conn = null;
             try
             {
                 IProtocol p = Protocols.DefaultProtocol;
                 IFrameHandler fh = p.CreateFrameHandler(Endpoint,
-                                                                        SocketFactory,
-                                                                        RequestedConnectionTimeout);
+                                                        SocketFactory,
+                                                        RequestedConnectionTimeout);
                 conn = p.CreateConnection(this, false, fh);
-                attempts[Endpoint] = 1;
             } catch (Exception e)
             {
 
-                errors[Endpoint] = e;
+                throw new BrokerUnreachableException(e);
             }
 
-            if(conn != null)
-            {
-                return conn;
-            } else
-            {
-                Exception cause = errors[Endpoint] as Exception;
-                throw new BrokerUnreachableException(attempts, errors, cause);
-            }
+            return conn;
         }
 
         ///<summary>Given a list of mechanism names supported by the

projects/client/RabbitMQ.Client/src/client/exceptions/BrokerUnreachableException.cs

@@ -48,61 +48,11 @@ namespace RabbitMQ.Client.Exceptions {
 
     ///<summary>Thrown when no connection could be opened during a
     ///ConnectionFactory.CreateConnection attempt.</summary>
-    ///<remarks>
-    /// CreateConnection (optionally) handles redirections, so even a
-    /// single-endpoint connection attempt may end up attempting to
-    /// connect to multiple TCP endpoints. This exception contains
-    /// information on how many times each endpoint was tried, and the
-    /// outcome of the most recent attempt against each endpoint. See
-    /// the ConnectionAttempts and ConnectionErrors properties.
-    ///</remarks>
     public class BrokerUnreachableException: IOException
     {
-        private IDictionary<AmqpTcpEndpoint, int> m_connectionAttempts;
-        private IDictionary<AmqpTcpEndpoint, Exception> m_connectionErrors;
-
-        ///<summary>A map from AmqpTcpEndpoint to int, counting the
-        ///number of attempts that were made against each
-        ///endpoint.</summary>
-        public IDictionary<AmqpTcpEndpoint, int> ConnectionAttempts { get { return m_connectionAttempts; } }
-
-        ///<summary>A map from AmqpTcpEndpoint to Exception, recording
-        ///the outcome of the most recent connection attempt against
-        ///each endpoint.</summary>
-        public IDictionary<AmqpTcpEndpoint, Exception> ConnectionErrors { get { return m_connectionErrors; } }
-
-        ///<summary>same as ConnectionErrors property</summary>
-        public override IDictionary Data { get { return new Dictionary<AmqpTcpEndpoint, Exception>(m_connectionErrors); } }
-
-        ///<summary>Construct a BrokerUnreachableException. Expects
-        ///maps as per the description of the ConnectionAttempts and
-        ///ConnectionErrors properties. The inner exception is associated
+        ///<summary>Construct a BrokerUnreachableException. The inner exception is associated
         ///with only one connection attempt.</summary>
-        public BrokerUnreachableException(IDictionary<AmqpTcpEndpoint, int> connectionAttempts,
-                                          IDictionary<AmqpTcpEndpoint, Exception> connectionErrors,
-                                          Exception Inner)
-            : base("None of the specified endpoints were reachable", Inner)
-        {
-            m_connectionAttempts = connectionAttempts;
-            m_connectionErrors = connectionErrors;
-        }
-
-        ///<summary>Provide a full description of the various
-        ///connection attempts that were made, as well as the usual
-        ///Exception stack trace.</summary>
-        public override string ToString() {
-            StringBuilder sb = new StringBuilder(base.Message);
-            sb.Append("\nEndpoints attempted:\n");
-            foreach (KeyValuePair<AmqpTcpEndpoint, int> entry in m_connectionAttempts) {
-                sb.Append("------------------------------------------------\n");
-                sb.Append("endpoint=").Append(entry.Key);
-                sb.Append(", attempts=").Append(entry.Value).Append("\n");
-                sb.Append(m_connectionErrors[entry.Key] as Exception);
-            }
-            sb.Append("\n================================================\n");
-            sb.Append("Stack trace:\n");
-            sb.Append(base.StackTrace);
-            return sb.ToString();
-        }
+        public BrokerUnreachableException(Exception Inner)
+            : base("None of the specified endpoints were reachable", Inner) {}
     }
 }

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

@@ -70,11 +70,7 @@ public void TestAuthFailure()
             }
             catch (BrokerUnreachableException bue)
             {
-                foreach (Object failureReason in bue.ConnectionErrors.Values)
-                {
-                    Assert.IsInstanceOf<AuthenticationFailureException>(
-                        failureReason);
-                }
+                Assert.IsInstanceOf<AuthenticationFailureException>(bue.InnerException);
             }
         }
     }