github-forks
/
redisson
mirror of https://github.com/redisson/redisson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

SCAN iteration on same node fixed. #277

Browse Source
pull/282/head
Nikita 9 years ago
parent 14262bd25e
commit fe824978c1
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File

8
src/main/java/org/redisson/CommandExecutorService.java
Unescape Escape View File

@ -440,7 +440,7 @@ public class CommandExecutorService implements CommandExecutor {
ex.set(new RedisTimeoutException()); ex.set(new RedisTimeoutException());
final Timeout timeout = connectionManager.getTimer().newTimeout(retryTimerTask, connectionManager.getConfig().getTimeout(), TimeUnit.MILLISECONDS); final Timeout timeout = connectionManager.getTimer().newTimeout(retryTimerTask, connectionManager.getConfig().getTimeout(), TimeUnit.MILLISECONDS);
Future<RedisConnection> connectionFuture; final Future<RedisConnection> connectionFuture;
if (readOnlyMode) { if (readOnlyMode) {
if (client != null) { if (client != null) {
connectionFuture = connectionManager.connectionReadOp(source, command, client); connectionFuture = connectionManager.connectionReadOp(source, command, client);
@ -542,7 +542,11 @@ public class CommandExecutorService implements CommandExecutor {
if (future.isSuccess()) { if (future.isSuccess()) {
R res = future.getNow(); R res = future.getNow();
if (res instanceof RedisClientResult) { if (res instanceof RedisClientResult) {
((RedisClientResult)res).setRedisClient(client); RedisClient redisClient = client;
if (redisClient == null) {
redisClient = connectionFuture.getNow().getRedisClient();
}
((RedisClientResult)res).setRedisClient(redisClient);
} }
mainPromise.setSuccess(res); mainPromise.setSuccess(res);
} else { } else {

Write Preview
Loading…
Cancel
Save