From 86653e145c3471f9990a2d885f15ad69fac2a110 Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@vmware.com>
Date: Tue, 9 Aug 2011 14:41:39 +0100
Subject: [PATCH] Tidy up fatal error message in for failed listener restart

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

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 7ad6ea16..a7c8b034 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
@@ -385,9 +385,8 @@ public class SimpleMessageListenerContainer extends AbstractMessageListenerConta
 					consumer = createBlockingQueueConsumer();
 					this.consumers.add(consumer);
 				} catch (RuntimeException e) {
-					logger.warn("Consumer died on restart. " + e.getClass() + ": " + e.getMessage());
-					// Thrown into the void (probably) in a background thread.
-					// Oh well, here goes...
+					logger.warn("Consumer failed irretrievably on restart. " + e.getClass() + ": " + e.getMessage());
+					// Re-throw and have it logged properly by the caller.
 					throw e;
 				}
 				this.taskExecutor.execute(new AsyncMessageProcessingConsumer(consumer));