From 390b8d8847591f607f3f8bf01b143a3aa462f307 Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@vmware.com>
Date: Mon, 18 Apr 2011 16:04:43 +0100
Subject: [PATCH] AMQP-149: count down latch before waiting for re-connect.

---
 .../amqp/rabbit/listener/SimpleMessageListenerContainer.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/SimpleMessageListenerContainer.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/SimpleMessageListenerContainer.java
index d72f2c4e..58a41120 100644
--- a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/SimpleMessageListenerContainer.java
+++ b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/SimpleMessageListenerContainer.java
@@ -456,9 +456,11 @@ public class SimpleMessageListenerContainer extends AbstractMessageListenerConta
 
 				try {
 					consumer.start();
+					start.countDown();
 				} catch (FatalListenerStartupException ex) {
 					throw ex;
 				} catch (Throwable t) {
+					start.countDown();
 					handleStartupFailure(t);
 					throw t;
 				}
@@ -466,7 +468,6 @@ public class SimpleMessageListenerContainer extends AbstractMessageListenerConta
 				// Always better to stop receiving as soon as possible if
 				// transactional
 				boolean continuable = false;
-				start.countDown();
 				while (isActive() || continuable) {
 					try {
 						// Will come back false when the queue is drained