Fixed - RedisConnection.close() method has private visibility. #5154

pull/5147/head^2
Nikita Koksharov 2 years ago
parent 012c99dce3
commit e97ae41ad4

@ -288,7 +288,17 @@ public class RedisConnection implements RedisCommands {
fastReconnect = null; fastReconnect = null;
} }
private void close() { public void close() {
try {
closeAsync().sync();
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
} catch (Exception e) {
throw e;
}
}
private void closeInternal() {
CommandData<?, ?> command = getCurrentCommand(); CommandData<?, ?> command = getCurrentCommand();
if ((command != null && command.isBlockingCommand()) if ((command != null && command.isBlockingCommand())
|| !connectionPromise.isDone()) { || !connectionPromise.isDone()) {
@ -304,7 +314,7 @@ public class RedisConnection implements RedisCommands {
public CompletableFuture<Void> forceFastReconnectAsync() { public CompletableFuture<Void> forceFastReconnectAsync() {
CompletableFuture<Void> promise = new CompletableFuture<Void>(); CompletableFuture<Void> promise = new CompletableFuture<Void>();
fastReconnect = promise; fastReconnect = promise;
close(); closeInternal();
return promise; return promise;
} }
@ -320,7 +330,7 @@ public class RedisConnection implements RedisCommands {
public ChannelFuture closeIdleAsync() { public ChannelFuture closeIdleAsync() {
status = Status.CLOSED_IDLE; status = Status.CLOSED_IDLE;
close(); closeInternal();
return channel.closeFuture(); return channel.closeFuture();
} }
@ -330,7 +340,7 @@ public class RedisConnection implements RedisCommands {
public ChannelFuture closeAsync() { public ChannelFuture closeAsync() {
status = Status.CLOSED; status = Status.CLOSED;
close(); closeInternal();
return channel.closeFuture(); return channel.closeFuture();
} }

Loading…
Cancel
Save