Merge bug25278 into default

Author: Tim Watson

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

@@ -49,6 +49,6 @@ public class AlreadyClosedException: OperationInterruptedException
         ///<summary>Construct an instance containing the given
         ///shutdown reason.</summary>
         public AlreadyClosedException(ShutdownEventArgs reason)
-            : base(reason) { }
+            : base(reason, "Already closed") { }
     }
 }

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

@@ -81,6 +81,16 @@ public OperationInterruptedException(ShutdownEventArgs reason)
             m_shutdownReason = reason;
         }
 
+        ///<summary>Construct an OperationInterruptedException with
+        ///the passed-in explanation and prefix, if any.</summary>
+        public OperationInterruptedException(ShutdownEventArgs reason, String prefix)
+        : base(reason == null ? (prefix + ": The AMQP operation was interrupted") :
+                   string.Format("{0}: The AMQP operation was interrupted: {1}",
+                                 prefix, reason))
+        {
+            m_shutdownReason = reason;
+        }
+
         ///<summary>Retrieves the explanation for the shutdown. May
         ///return null if no explanation is available.</summary>
         public ShutdownEventArgs ShutdownReason { get { return m_shutdownReason; } }

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

@@ -494,16 +494,7 @@ public void Enqueue(IRpcContinuation k)
         public void TransmitAndEnqueue(Command cmd, IRpcContinuation k)
         {
             Enqueue(k);
-            try
-            {
-                m_session.Transmit(cmd);
-            }
-            catch (AlreadyClosedException)
-            {
-                // Ignored, since the continuation will be told about
-                // the closure via an OperationInterruptedException because
-                // of the shutdown event propagation.
-            }
+            m_session.Transmit(cmd);
         }
 
         public ShutdownEventArgs CloseReason
@@ -894,16 +885,7 @@ private QueueDeclareOk QueueDeclare(string queue, bool passive, bool durable, bo
         {
             QueueDeclareRpcContinuation k = new QueueDeclareRpcContinuation();
             Enqueue(k);
-            try
-            {
-                _Private_QueueDeclare(queue, passive, durable, exclusive, autoDelete, false, arguments);
-            }
-            catch (AlreadyClosedException)
-            {
-                // Ignored, since the continuation will be told about
-                // the closure via an OperationInterruptedException because
-                // of the shutdown event propagation.
-            }
+            _Private_QueueDeclare(queue, passive, durable, exclusive, autoDelete, false, arguments);
             k.GetReply();
             return k.m_result;
         }
@@ -988,7 +970,7 @@ public bool WaitForConfirms(TimeSpan timeout, out bool timedOut)
             {
                 while (true)
                 {
-                    if (CloseReason != null)
+                    if (!IsOpen)
                         throw new AlreadyClosedException(CloseReason);
 
                     if (m_unconfirmedSet.Count == 0)
@@ -1095,17 +1077,8 @@ public string BasicConsume(string queue,
             Enqueue(k);
             // Non-nowait. We have an unconventional means of getting
             // the RPC response, but a response is still expected.
-            try
-            {
-                _Private_BasicConsume(queue, consumerTag, noLocal, noAck, exclusive,
+            _Private_BasicConsume(queue, consumerTag, noLocal, noAck, exclusive,
                     /*nowait:*/ false, arguments);
-            }
-            catch (AlreadyClosedException)
-            {
-                // Ignored, since the continuation will be told about
-                // the closure via an OperationInterruptedException because
-                // of the shutdown event propagation.
-            }
             k.GetReply();
             string actualConsumerTag = k.m_consumerTag;
 
@@ -1141,17 +1114,7 @@ public void BasicCancel(string consumerTag)
 
             Enqueue(k);
 
-            try
-            {
-                _Private_BasicCancel(consumerTag, false);
-            }
-            catch (AlreadyClosedException)
-            {
-                // Ignored, since the continuation will be told about
-                // the closure via an OperationInterruptedException because
-                // of the shutdown event propagation.
-            }
-
+            _Private_BasicCancel(consumerTag, false);
             k.GetReply();
 
             ModelShutdown -= new ModelShutdownEventHandler(k.m_consumer.HandleModelShutdown);
@@ -1197,16 +1160,7 @@ public BasicGetResult BasicGet(string queue,
         {
             BasicGetRpcContinuation k = new BasicGetRpcContinuation();
             Enqueue(k);
-            try
-            {
-                _Private_BasicGet(queue, noAck);
-            }
-            catch (AlreadyClosedException)
-            {
-                // Ignored, since the continuation will be told about
-                // the closure via an OperationInterruptedException because
-                // of the shutdown event propagation.
-            }
+            _Private_BasicGet(queue, noAck);
             k.GetReply();
             return k.m_result;
         }
@@ -1218,18 +1172,7 @@ public void BasicRecover(bool requeue)
             SimpleBlockingRpcContinuation k = new SimpleBlockingRpcContinuation();
 
             Enqueue(k);
-
-            try
-            {
-                _Private_BasicRecover(requeue);
-            }
-            catch (AlreadyClosedException)
-            {
-                // Ignored, since the continuation will be told about
-                // the closure via an OperationInterruptedException because
-                // of the shutdown event propagation.
-            }
-
+            _Private_BasicRecover(requeue);
             k.GetReply();
         }
 

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

@@ -0,0 +1,74 @@
+// 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-2013 GoPivotal, 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 GoPivotal, Inc.
+//  Copyright (c) 2007-2014 GoPivotal, Inc.  All rights reserved.
+//---------------------------------------------------------------------------
+
+using NUnit.Framework;
+using System;
+using RabbitMQ.Client.Exceptions;
+
+namespace RabbitMQ.Client.Unit
+{
+    [TestFixture]
+    public class TestExceptionMessages : IntegrationFixture
+    {
+        [Test]
+        public void TestAlreadyClosedExceptionMessage()
+        {
+            var uuid = System.Guid.NewGuid().ToString();
+            try
+            {
+                Model.QueueDeclarePassive(uuid);
+            } catch (Exception e)
+            {
+                Assert.That(e, Is.TypeOf(typeof(OperationInterruptedException)));
+            }
+
+            Assert.IsFalse(Model.IsOpen);
+
+            try
+            {
+                Model.QueueDeclarePassive(uuid);
+            } catch (AlreadyClosedException e)
+            {
+                Assert.That(e, Is.TypeOf(typeof(AlreadyClosedException)));
+                Assert.IsTrue(e.Message.StartsWith("Already closed"));
+            }
+        }
+    }
+}