merge bug23747 into default

Author: Tim Watson

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

@@ -0,0 +1,50 @@
+// This source code is dual-licensed under the Apache License, version
+// 2.0, and the Mozilla Public License, version 1.1.
+//
+// The APL v2.0:
+//
+//---------------------------------------------------------------------------
+//   Copyright (C) 2007-2012 VMware, Inc.
+//
+//   Licensed under the Apache License, Version 2.0 (the "License");
+//   you may not use this file except in compliance with the License.
+//   You may obtain a copy of the License at
+//
+//       http://www.apache.org/licenses/LICENSE-2.0
+//
+//   Unless required by applicable law or agreed to in writing, software
+//   distributed under the License is distributed on an "AS IS" BASIS,
+//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//   See the License for the specific language governing permissions and
+//   limitations under the License.
+//---------------------------------------------------------------------------
+//
+// The MPL v1.1:
+//
+//---------------------------------------------------------------------------
+//  The contents of this file are subject to the Mozilla Public License
+//  Version 1.1 (the "License"); you may not use this file except in
+//  compliance with the License. You may obtain a copy of the License
+//  at http://www.mozilla.org/MPL/
+//
+//  Software distributed under the License is distributed on an "AS IS"
+//  basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+//  the License for the specific language governing rights and
+//  limitations under the License.
+//
+//  The Original Code is RabbitMQ.
+//
+//  The Initial Developer of the Original Code is VMware, Inc.
+//  Copyright (c) 2007-2012 VMware, Inc.  All rights reserved.
+//---------------------------------------------------------------------------
+
+using System;
+
+namespace RabbitMQ.Client.Exceptions {
+    /// <summary>Thrown when a connection to the broker fails</summary>
+    public class ConnectFailureException: SystemException
+    {
+        public ConnectFailureException(String msg, Exception inner)
+            : base(msg, inner) { }
+    }
+}

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

@@ -44,6 +44,7 @@
 using System.Text;
 
 using RabbitMQ.Util;
+using RabbitMQ.Client.Exceptions;
 
 namespace RabbitMQ.Client.Impl
 {
@@ -75,7 +76,7 @@ public SocketFrameHandler_0_9(AmqpTcpEndpoint endpoint,
                     m_socket = socketFactory(AddressFamily.InterNetworkV6);
                     Connect(m_socket, endpoint, timeout);
                 }
-                catch (ArgumentException) // could not connect using IPv6
+                catch (ConnectFailureException) // could not connect using IPv6
                 {
                     m_socket = null;
                 }
@@ -116,6 +117,14 @@ private void Connect(TcpClient socket, AmqpTcpEndpoint endpoint, int timeout)
                 }
                 socket.EndConnect(ar);
             }
+            catch (ArgumentException e)
+            {
+                throw new ConnectFailureException("Connection failed", e);
+            }
+            catch (SocketException e)
+            {
+                throw new ConnectFailureException("Connection failed", e);
+            }
             finally
             {
                 if (ar != null)