Merge bug26068

Author: Simon MacMullen

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/Unit/src/unit/TestExceptionMessages.cs

@@ -67,6 +67,7 @@ public void TestAlreadyClosedExceptionMessage()
             } catch (AlreadyClosedException e)
             {
                 Assert.That(e, Is.TypeOf(typeof(AlreadyClosedException)));
+                Assert.IsTrue(e.Message.StartsWith("Already closed"));
             }
         }
     }