diff --git a/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java b/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java index cce9e533d..6ac893733 100644 --- a/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java +++ b/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java @@ -603,16 +603,16 @@ public class MasterSlaveConnectionManager implements ConnectionManager { } @Override - public Future unsubscribe(String channelName) { + public Future unsubscribe(String channelName) { final PubSubConnectionEntry entry = name2PubSubConnection.remove(channelName); if (entry == null) { return group.next().newSucceededFuture(null); } - Future future = entry.unsubscribe(channelName); - future.addListener(new FutureListener() { + Future future = entry.unsubscribe(channelName); + future.addListener(new FutureListener() { @Override - public void operationComplete(Future future) throws Exception { + public void operationComplete(Future future) throws Exception { synchronized (entry) { if (entry.tryClose()) { returnSubscribeConnection(-1, entry); @@ -624,16 +624,16 @@ public class MasterSlaveConnectionManager implements ConnectionManager { } @Override - public Future punsubscribe(String channelName) { + public Future punsubscribe(String channelName) { final PubSubConnectionEntry entry = name2PubSubConnection.remove(channelName); if (entry == null) { return group.next().newSucceededFuture(null); } - Future future = entry.punsubscribe(channelName); - future.addListener(new FutureListener() { + Future future = entry.punsubscribe(channelName); + future.addListener(new FutureListener() { @Override - public void operationComplete(Future future) throws Exception { + public void operationComplete(Future future) throws Exception { synchronized (entry) { if (entry.tryClose()) { returnSubscribeConnection(-1, entry);