From 560b38c0fc11d261c84724a35be2c8f118cb03f8 Mon Sep 17 00:00:00 2001
From: Costin Leau <cleau@vmware.com>
Date: Mon, 24 Jan 2011 21:53:34 +0200
Subject: [PATCH] + improve shutdown of Redis container (skipped waiting if the
 container is not started)

---
 .../RedisMessageListenerContainer.java        | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/listener/RedisMessageListenerContainer.java b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/listener/RedisMessageListenerContainer.java
index 72fe03c15..f2620444d 100644
--- a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/listener/RedisMessageListenerContainer.java
+++ b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/listener/RedisMessageListenerContainer.java
@@ -193,13 +193,17 @@ public class RedisMessageListenerContainer implements InitializingBean, Disposab
 
 	@Override
 	public void stop() {
-		running = false;
-		synchronized (monitor) {
-			subscriptionTask.cancel();
-			try {
-				monitor.wait(initWait);
-			} catch (InterruptedException ex) {
-				// stop waiting
+		if (isRunning()) {
+			running = false;
+			synchronized (monitor) {
+				subscriptionTask.cancel();
+				if (listening) {
+					try {
+						monitor.wait(initWait);
+					} catch (InterruptedException ex) {
+						// stop waiting
+					}
+				}
 			}
 		}
 
@@ -341,10 +345,6 @@ public class RedisMessageListenerContainer implements InitializingBean, Disposab
 							started = true;
 						}
 					}
-					else {
-						listening = false;
-					}
-
 				}
 				if (debug) {
 					if (started) {