From 33de0e9e91049160ba18ead55232b0e77f2d3dfc Mon Sep 17 00:00:00 2001
From: Nikita <abracham.mitchell@gmail.com>
Date: Thu, 12 Oct 2017 12:33:50 +0300
Subject: [PATCH] HashedWheelTimer should be stopped first. #1090

---
 .../org/redisson/connection/MasterSlaveConnectionManager.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/redisson/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java b/redisson/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java
index 98c9c671f..e159fbc3a 100644
--- a/redisson/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java
+++ b/redisson/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java
@@ -816,6 +816,8 @@ public class MasterSlaveConnectionManager implements ConnectionManager {
             dnsMonitor.stop();
         }
 
+        timer.stop();
+        
         shutdownLatch.close();
         shutdownPromise.trySuccess(true);
         shutdownLatch.awaitUninterruptibly();
@@ -836,7 +838,6 @@ public class MasterSlaveConnectionManager implements ConnectionManager {
         if (cfg.getEventLoopGroup() == null) {
             group.shutdownGracefully(quietPeriod, timeout, unit).syncUninterruptibly();
         }
-        timer.stop();
     }
 
     @Override