From 84f69e82f494453a7b3a1d5a36cd8a1f5a38be23 Mon Sep 17 00:00:00 2001 From: Nikita Koksharov Date: Mon, 13 Nov 2023 13:29:52 +0300 Subject: [PATCH] refactoring --- .../src/main/java/org/redisson/config/ConfigSupport.java | 6 +----- .../java/org/redisson/connection/ConnectionManager.java | 2 +- .../redisson/connection/MasterSlaveConnectionManager.java | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/redisson/src/main/java/org/redisson/config/ConfigSupport.java b/redisson/src/main/java/org/redisson/config/ConfigSupport.java index 48f2952b0..2bde087c2 100644 --- a/redisson/src/main/java/org/redisson/config/ConfigSupport.java +++ b/redisson/src/main/java/org/redisson/config/ConfigSupport.java @@ -217,11 +217,7 @@ public class ConfigSupport { throw new IllegalArgumentException("server(s) address(es) not defined!"); } if (!configCopy.isLazyInitialization()) { - try { - cm.connect(); - } catch (InterruptedException e) { - Thread.currentThread().interrupt(); - } + cm.connect(); } return cm; } diff --git a/redisson/src/main/java/org/redisson/connection/ConnectionManager.java b/redisson/src/main/java/org/redisson/connection/ConnectionManager.java index 5b83e7d2f..363e78331 100644 --- a/redisson/src/main/java/org/redisson/connection/ConnectionManager.java +++ b/redisson/src/main/java/org/redisson/connection/ConnectionManager.java @@ -32,7 +32,7 @@ import java.util.concurrent.TimeUnit; */ public interface ConnectionManager { - void connect() throws InterruptedException; + void connect(); PublishSubscribeService getSubscribeService(); diff --git a/redisson/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java b/redisson/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java index 2187687a3..a13626992 100644 --- a/redisson/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java +++ b/redisson/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java @@ -173,8 +173,6 @@ public class MasterSlaveConnectionManager implements ConnectionManager { try { connect(); f.complete(null); - } catch (InterruptedException e) { - Thread.currentThread().interrupt(); } catch (Exception e) { f.completeExceptionally(e); lazyConnectLatch.set(null); @@ -183,7 +181,7 @@ public class MasterSlaveConnectionManager implements ConnectionManager { } @Override - public final void connect() throws InterruptedException { + public final void connect() { int attempts = config.getRetryAttempts() + 1; for (int i = 0; i < attempts; i++) { try {