From 7abe00e911201ec1f26059b8a939c13c440b4655 Mon Sep 17 00:00:00 2001
From: Nikita <abracham.mitchell@gmail.com>
Date: Tue, 10 Jun 2014 16:59:30 +0400
Subject: [PATCH] SingleConnectionManager.nextPubSubConnection fixed. #33

---
 .../org/redisson/connection/SingleConnectionManager.java   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/redisson/connection/SingleConnectionManager.java b/src/main/java/org/redisson/connection/SingleConnectionManager.java
index bd7342460..e27b4bc09 100644
--- a/src/main/java/org/redisson/connection/SingleConnectionManager.java
+++ b/src/main/java/org/redisson/connection/SingleConnectionManager.java
@@ -60,7 +60,12 @@ public class SingleConnectionManager extends MasterSlaveConnectionManager {
     RedisPubSubConnection nextPubSubConnection() {
         acquireSubscribeConnection();
 
-        RedisPubSubConnection conn = masterClient.connectPubSub(codec);
+        RedisPubSubConnection conn = subscribeConnections.poll();
+        if (conn != null) {
+            return conn;
+        }
+
+        conn = masterClient.connectPubSub(codec);
         if (config.getPassword() != null) {
             conn.auth(config.getPassword());
         }