Add a test and extra guard to prevent duplicate shutdown hooks that initial recovery

This ended up not being an issue in the Java client as much as in .NET.

Author: michaelklishin

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

@@ -356,7 +356,9 @@ public void shutdownCompleted(ShutdownSignalException cause) {
             }
         };
         synchronized (this) {
-            this.shutdownHooks.add(automaticRecoveryListener);
+            if(!this.shutdownHooks.contains(automaticRecoveryListener)) {
+                this.shutdownHooks.add(automaticRecoveryListener);
+            }
             this.delegate.addShutdownListener(automaticRecoveryListener);
         }
     }

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

@@ -432,6 +432,20 @@ public void consumerRecovered(String oldConsumerTag, String newConsumerTag) {
 
     }
 
+    public void testSubsequentRecoveriesWithClientNamedQueue() throws IOException, InterruptedException {
+        String q = channel.queueDeclare(UUID.randomUUID().toString(), false, false, false, null).getQueue();
+
+        assertConsumerCount(0, q);
+        channel.basicConsume(q, new DefaultConsumer(channel));
+
+        for(int i = 0; i < 10; i++) {
+            assertConsumerCount(1, q);
+            closeAndWaitForRecovery();
+        }
+
+        channel.queueDelete(q);
+    }
+
     public void testQueueRecoveryWithManyQueues() throws IOException, InterruptedException, TimeoutException {
         List<String> qs = new ArrayList<String>();
         final int n = 1024;