From 8cb409ffccaa9125d078d698cde7886c227477f1 Mon Sep 17 00:00:00 2001 From: Nikita Date: Thu, 14 Jul 2016 13:42:13 +0300 Subject: [PATCH] NPE during pubsub usage in cluster --- .../connection/MasterSlaveConnectionManager.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java b/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java index 6ae43cac9..3a5c1d129 100644 --- a/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java +++ b/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java @@ -139,14 +139,16 @@ public class MasterSlaveConnectionManager implements ConnectionManager { private final Semaphore[] locks = new Semaphore[50]; private final Semaphore freePubSubLock = new Semaphore(1); + + { + for (int i = 0; i < locks.length; i++) { + locks[i] = new Semaphore(1); + } + } public MasterSlaveConnectionManager(MasterSlaveServersConfig cfg, Config config) { this(config); init(cfg); - - for (int i = 0; i < locks.length; i++) { - locks[i] = new Semaphore(1); - } } public MasterSlaveConnectionManager(Config cfg) {