From b3fed96b253d42f0fe735900622fda173831cf76 Mon Sep 17 00:00:00 2001
From: Nikita <abracham.mitchell@gmail.com>
Date: Thu, 14 Jul 2016 18:22:08 +0300
Subject: [PATCH] NPE during re-subscription fixed

---
 .../java/org/redisson/connection/PubSubConnectionEntry.java   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/java/org/redisson/connection/PubSubConnectionEntry.java b/src/main/java/org/redisson/connection/PubSubConnectionEntry.java
index 11f3b2fd5..ce5850c1d 100644
--- a/src/main/java/org/redisson/connection/PubSubConnectionEntry.java
+++ b/src/main/java/org/redisson/connection/PubSubConnectionEntry.java
@@ -61,6 +61,10 @@ public class PubSubConnectionEntry {
     }
 
     public void addListener(String channelName, RedisPubSubListener<?> listener) {
+        if (listener == null) {
+            return;
+        }
+        
         Queue<RedisPubSubListener> queue = channelListeners.get(channelName);
         if (queue == null) {
             queue = new ConcurrentLinkedQueue<RedisPubSubListener>();