Update AutorecoveringConnection to call ShutdownListeners before reconnecting.

Author: doswell

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

@@ -300,15 +300,13 @@ public void close(int closeCode, String closeMessage) throws IOException {
      */
     public void addShutdownListener(ShutdownListener listener) {
         this.shutdownHooks.add(listener);
-        delegate.addShutdownListener(listener);
     }
 
     /**
      * @see com.rabbitmq.client.ShutdownNotifier#removeShutdownListener(com.rabbitmq.client.ShutdownListener)
      */
     public void removeShutdownListener(ShutdownListener listener) {
         this.shutdownHooks.remove(listener);
-        delegate.removeShutdownListener(listener);
     }
 
     /**
@@ -378,6 +376,12 @@ private void addAutomaticRecoveryListener() {
         final AutorecoveringConnection c = this;
         ShutdownListener automaticRecoveryListener = new ShutdownListener() {
             public void shutdownCompleted(ShutdownSignalException cause) {
+
+		//Call each shutdown listener before reconnecting. 
+		for (ShutdownListener listener : c.shutdownHooks) {
+			listener.shutdownCompleted(cause);
+		}            	
+            	
                 try {
                     if (shouldTriggerConnectionRecovery(cause)) {
                         c.beginAutomaticRecovery();
@@ -387,12 +391,7 @@ public void shutdownCompleted(ShutdownSignalException cause) {
                 }
             }
         };
-        synchronized (this) {
-            if(!this.shutdownHooks.contains(automaticRecoveryListener)) {
-                this.shutdownHooks.add(automaticRecoveryListener);
-            }
-            this.delegate.addShutdownListener(automaticRecoveryListener);
-        }
+	this.delegate.addShutdownListener(automaticRecoveryListener);
     }
 
     protected boolean shouldTriggerConnectionRecovery(ShutdownSignalException cause) {
@@ -456,9 +455,8 @@ synchronized private void beginAutomaticRecovery() throws InterruptedException,
     }
 
     private void recoverShutdownListeners() {
-        for (ShutdownListener sh : this.shutdownHooks) {
-            this.delegate.addShutdownListener(sh);
-        }
+    	//Add the auto recovering listener to the new delegate.
+    	addAutomaticRecoveryListener();
     }
 
     private void recoverBlockedListeners() {