Stop HashedWheelTimer after exception in constructor

redisson · Mar 16, 2016 · d9c97a8 · d9c97a8
1 parent 53884ef
commit d9c97a8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/src/main/java/org/redisson/cluster/ClusterConnectionManager.java b/src/main/java/org/redisson/cluster/ClusterConnectionManager.java
@@ -96,11 +96,7 @@ public ClusterConnectionManager(ClusterServersConfig cfg, Config config) {
         }
 
         if (lastPartitions.isEmpty()) {
-            try {
-                group.shutdownGracefully().await();
-            } catch (Exception e) {
-                // skip it
-            }
+            stopThreads();
             throw new RedisConnectionException("Can't connect to servers!", lastException);
         }
 

diff --git a/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java b/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java
@@ -202,11 +202,7 @@ protected void init(MasterSlaveServersConfig config) {
         try {
             initEntry(config);
         } catch (RuntimeException e) {
-            try {
-                group.shutdownGracefully().await();
-            } catch (Exception e1) {
-                // skip
-            }
+            stopThreads();
             throw e;
         }
     }
@@ -741,4 +737,12 @@ public ConnectionEventsHub getConnectionEventsHub() {
         return connectionEventsHub;
     }
 
+    protected void stopThreads() {
+        timer.stop();
+        try {
+            group.shutdownGracefully().await();
+        } catch (InterruptedException ignored) {
+            Thread.currentThread().interrupt();
+        }
+    }
 }