From 8ea13026417577bd600bb015d2d96d312705c4c9 Mon Sep 17 00:00:00 2001 From: Costin Leau Date: Wed, 27 Jul 2011 11:35:45 +0300 Subject: [PATCH] + minor improvements to RedisMLC --- .../data/redis/listener/RedisMessageListenerContainer.java | 3 ++- .../org/springframework/data/redis/config/NamespaceTest.java | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/springframework/data/redis/listener/RedisMessageListenerContainer.java b/src/main/java/org/springframework/data/redis/listener/RedisMessageListenerContainer.java index 7a574381b..3d21ef6e3 100644 --- a/src/main/java/org/springframework/data/redis/listener/RedisMessageListenerContainer.java +++ b/src/main/java/org/springframework/data/redis/listener/RedisMessageListenerContainer.java @@ -203,8 +203,9 @@ public class RedisMessageListenerContainer implements InitializingBean, Disposab if (isRunning()) { running = false; synchronized (monitor) { + boolean shouldWait = listening; subscriptionTask.cancel(); - if (listening) { + if (shouldWait) { try { monitor.wait(initWait); } catch (InterruptedException ex) { diff --git a/src/test/java/org/springframework/data/redis/config/NamespaceTest.java b/src/test/java/org/springframework/data/redis/config/NamespaceTest.java index 1cedef1d3..c750ec861 100644 --- a/src/test/java/org/springframework/data/redis/config/NamespaceTest.java +++ b/src/test/java/org/springframework/data/redis/config/NamespaceTest.java @@ -49,7 +49,7 @@ public class NamespaceTest { public void testSanityTest() throws Exception { RedisMessageListenerContainer container = ctx.getBean(RedisMessageListenerContainer.class); assertTrue(container.isRunning()); - //Thread.sleep(TimeUnit.SECONDS.toMillis(1)); + Thread.sleep(TimeUnit.SECONDS.toMillis(2)); } @Test @@ -57,7 +57,7 @@ public class NamespaceTest { StringRedisTemplate template = ctx.getBean(StringRedisTemplate.class); template.convertAndSend("x1", "[X]test"); template.convertAndSend("z1", "[Z]test"); - //Thread.sleep(TimeUnit.SECONDS.toMillis(5)); + Thread.sleep(TimeUnit.SECONDS.toMillis(5)); } public void testErrorHandler() throws Exception {