Test that recovery starts after all connection shutdown hooks have executed

Note: we cannot guarantee that they'd have *finished* by the time
recovery starts. Provided that ShutdownListeners are typically
basic sequential functions, that'll be the case most of the
time.

Fixes #135

Author: michaelklishin

src/main/java/com/rabbitmq/client/impl/recovery/AutorecoveringConnection.java

@@ -11,6 +11,7 @@
 import com.rabbitmq.client.ShutdownListener;
 import com.rabbitmq.client.ShutdownSignalException;
 import com.rabbitmq.client.TopologyRecoveryException;
+import com.rabbitmq.client.impl.AMQConnection;
 import com.rabbitmq.client.impl.ConnectionParams;
 import com.rabbitmq.client.ExceptionHandler;
 import com.rabbitmq.client.impl.FrameHandlerFactory;
@@ -254,6 +255,13 @@ public void abort(int timeout) {
         delegate.abort(timeout);
     }
 
+    /**
+    * Not supposed to be used outside of automated tests.
+    */
+    public AMQConnection getDelegate() {
+        return delegate;
+    }
+
     /**
      * @see com.rabbitmq.client.Connection#getCloseReason()
      */

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

@@ -1,12 +1,10 @@
 package com.rabbitmq.client.test.functional;
 
 import com.rabbitmq.client.*;
-import com.rabbitmq.client.impl.recovery.AutorecoveringChannel;
-import com.rabbitmq.client.impl.recovery.AutorecoveringConnection;
+import com.rabbitmq.client.impl.AMQConnection;
+import com.rabbitmq.client.impl.recovery.*;
 import com.rabbitmq.client.Recoverable;
 import com.rabbitmq.client.RecoveryListener;
-import com.rabbitmq.client.impl.recovery.ConsumerRecoveryListener;
-import com.rabbitmq.client.impl.recovery.QueueRecoveryListener;
 import com.rabbitmq.client.test.BrokerTestCase;
 import com.rabbitmq.tools.Host;
 
@@ -90,6 +88,44 @@ public void testConnectionRecoveryWithDisabledTopologyRecovery()
         }
     }
 
+    // see https://github.com/rabbitmq/rabbitmq-java-client/issues/135
+    public void testThatShutdownHooksOnConnectionFireBeforeRecoveryStarts() throws IOException, InterruptedException {
+        final List<String> events = new ArrayList<String>();
+        final CountDownLatch latch = new CountDownLatch(1);
+        connection.addShutdownListener(new ShutdownListener() {
+            public void shutdownCompleted(ShutdownSignalException cause) {
+                events.add("shutdown hook 1");
+            }
+        });
+        connection.addShutdownListener(new ShutdownListener() {
+            public void shutdownCompleted(ShutdownSignalException cause) {
+                events.add("shutdown hook 2");
+            }
+        });
+        // note: we do not want to expose RecoveryCanBeginListener so this
+        // test does not use it
+        ((AutorecoveringConnection)connection).getDelegate().addRecoveryCanBeginListener(new RecoveryCanBeginListener() {
+            @Override
+            public void recoveryCanBegin(ShutdownSignalException cause) {
+                events.add("recovery start hook 1");
+            }
+        });
+        ((AutorecoveringConnection)connection).addRecoveryListener(new RecoveryListener() {
+            @Override
+            public void handleRecovery(Recoverable recoverable) {
+                latch.countDown();
+            }
+        });
+        assertTrue(connection.isOpen());
+        closeAndWaitForRecovery();
+        assertTrue(connection.isOpen());
+        assertEquals("shutdown hook 1", events.get(0));
+        assertEquals("shutdown hook 2", events.get(1));
+        assertEquals("recovery start hook 1", events.get(2));
+        connection.close();
+        wait(latch);
+    }
+
     public void testShutdownHooksRecoveryOnConnection() throws IOException, InterruptedException {
         final CountDownLatch latch = new CountDownLatch(2);
         connection.addShutdownListener(new ShutdownListener() {