Merge bug26068

Author: Simon MacMullen

src/com/rabbitmq/client/AlreadyClosedException.java

@@ -30,6 +30,7 @@ public AlreadyClosedException(ShutdownSignalException sse)
         super(sse.isHardError(),
               sse.isInitiatedByApplication(),
               sse.getReason(),
-              sse.getReference());
+              sse.getReference(),
+              (sse.isHardError() ? "connection" : "channel" + " is already closed due to previous "));
     }
 }

src/com/rabbitmq/client/ShutdownSignalException.java

@@ -57,10 +57,25 @@ public ShutdownSignalException(boolean hardError,
                                    boolean initiatedByApplication,
                                    Method reason, Object ref)
     {
-        super((initiatedByApplication
-               ? ("clean " + (hardError ? "connection" : "channel") + " shutdown")
-               : ((hardError ? "connection" : "channel") + " error"))
-              + "; reason: " + reason);
+        this(hardError, initiatedByApplication, reason, ref, "");
+    }
+
+    /**
+     * Construct a ShutdownSignalException from the arguments.
+     * @param hardError the relevant hard error
+     * @param initiatedByApplication if the shutdown was client-initiated
+     * @param reason AMQP method describing the exception reason
+     * @param ref Reference to Connection or Channel that fired the signal
+     * @param messagePrefix prefix to add to exception message
+     */
+    public ShutdownSignalException(boolean hardError,
+                                   boolean initiatedByApplication,
+                                   Method reason, Object ref, String messagePrefix)
+    {
+        super(messagePrefix + (initiatedByApplication
+                       ? ("clean " + (hardError ? "connection" : "channel") + " shutdown")
+                       : ((hardError ? "connection" : "channel") + " error"))
+                      + "; reason: " + reason);
         this._hardError = hardError;
         this._initiatedByApplication = initiatedByApplication;
         this._reason = reason;

test/src/com/rabbitmq/client/test/functional/ExceptionMessages.java

@@ -0,0 +1,37 @@
+package com.rabbitmq.client.test.functional;
+
+import com.rabbitmq.client.AlreadyClosedException;
+import com.rabbitmq.client.test.BrokerTestCase;
+
+import java.io.IOException;
+import java.util.UUID;
+
+public class ExceptionMessages extends BrokerTestCase {
+    public void testAlreadyClosedExceptionMessageWithChannelError() throws IOException {
+        String uuid = UUID.randomUUID().toString();
+        try {
+            channel.queueDeclarePassive(uuid);
+            fail("expected queueDeclarePassive to throw");
+        } catch (IOException e) {
+            // ignored
+        }
+
+        try {
+            channel.queueDeclarePassive(uuid);
+            fail("expected queueDeclarePassive to throw");
+        } catch (AlreadyClosedException ace) {
+            assertTrue(ace.getMessage().startsWith("channel is already closed due to channel error"));
+        }
+    }
+
+    public void testAlreadyClosedExceptionMessageWithCleanClose() throws IOException {
+        String uuid = UUID.randomUUID().toString();
+
+        try {
+            channel.close();
+            channel.queueDeclare(uuid, false, false, false, null);
+        } catch (AlreadyClosedException ace) {
+            assertTrue(ace.getMessage().startsWith("channel is already closed due to clean channel shutdown"));
+        }
+    }
+}