diff --git a/redisson/src/main/java/org/redisson/RedissonRemoteService.java b/redisson/src/main/java/org/redisson/RedissonRemoteService.java index 83f109d9c..db0b4809e 100644 --- a/redisson/src/main/java/org/redisson/RedissonRemoteService.java +++ b/redisson/src/main/java/org/redisson/RedissonRemoteService.java @@ -658,7 +658,7 @@ public class RedissonRemoteService implements RRemoteService { private Future tryPollAckAgainAsync(RemoteInvocationOptions optionsCopy, final RBlockingQueue responseQueue, String ackName) throws InterruptedException { - final Promise promise = ImmediateEventExecutor.INSTANCE.newPromise(); + final Promise promise = commandExecutor.getConnectionManager().newPromise(); Future ackClientsFuture = commandExecutor.evalWriteAsync(ackName, LongCodec.INSTANCE, RedisCommands.EVAL_BOOLEAN, "if redis.call('setnx', KEYS[1], 1) == 1 then " + "redis.call('pexpire', KEYS[1], ARGV[1]);" diff --git a/redisson/src/main/java/org/redisson/RedissonSortedSet.java b/redisson/src/main/java/org/redisson/RedissonSortedSet.java index 730b46b6c..5356fcb26 100644 --- a/redisson/src/main/java/org/redisson/RedissonSortedSet.java +++ b/redisson/src/main/java/org/redisson/RedissonSortedSet.java @@ -289,7 +289,7 @@ public class RedissonSortedSet extends RedissonObject implements RSortedSet removeAsync(final V value) { EventLoopGroup group = commandExecutor.getConnectionManager().getGroup(); - final Promise promise = group.next().newPromise(); + final Promise promise = newPromise(); group.execute(new Runnable() { @Override diff --git a/redisson/src/main/java/org/redisson/connection/ClientConnectionsEntry.java b/redisson/src/main/java/org/redisson/connection/ClientConnectionsEntry.java index 2050050a6..a4c2613cd 100644 --- a/redisson/src/main/java/org/redisson/connection/ClientConnectionsEntry.java +++ b/redisson/src/main/java/org/redisson/connection/ClientConnectionsEntry.java @@ -139,7 +139,7 @@ public class ClientConnectionsEntry { } public Future connect() { - final Promise connectionFuture = ImmediateEventExecutor.INSTANCE.newPromise(); + final Promise connectionFuture = connectionManager.newPromise(); Future future = client.connectAsync(); future.addListener(new FutureListener() { @Override @@ -192,7 +192,7 @@ public class ClientConnectionsEntry { } public Future connectPubSub() { - final Promise connectionFuture = ImmediateEventExecutor.INSTANCE.newPromise(); + final Promise connectionFuture = connectionManager.newPromise(); Future future = client.connectPubSubAsync(); future.addListener(new FutureListener() { @Override