From fb9b2215d32e54d00847e757101eb938c437c5a1 Mon Sep 17 00:00:00 2001 From: Costin Leau Date: Thu, 7 Feb 2013 21:26:38 +0200 Subject: [PATCH] improve unsubscription of channels/patterns in LettuceSub DATAREDIS-113 --- .../connection/lettuce/LettuceSubscription.java | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceSubscription.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceSubscription.java index ec6e79f43..fdda3b5ef 100644 --- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceSubscription.java +++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceSubscription.java @@ -52,12 +52,8 @@ class LettuceSubscription extends AbstractSubscription { } protected void doPUnsubscribe(boolean all, byte[]... patterns) { - if (all) { - pubsub.punsubscribe(new byte[0]); - } - else { - pubsub.punsubscribe(patterns); - } + // lettuce doesn't automatically subscribe from all channels + pubsub.punsubscribe(patterns); } protected void doSubscribe(byte[]... channels) { @@ -65,11 +61,7 @@ class LettuceSubscription extends AbstractSubscription { } protected void doUnsubscribe(boolean all, byte[]... channels) { - if (all) { - pubsub.unsubscribe(new byte[0]); - } - else { - pubsub.unsubscribe(channels); - } + // lettuce doesn't automatically subscribe from all patterns + pubsub.unsubscribe(channels); } } \ No newline at end of file