Redis response timeout handling improvement

6 years ago · d79755e325
parent 31dfbdbcf2
commit d79755e325
1 changed files with 2 additions and 1 deletions
--- a/redisson/src/main/java/org/redisson/command/CommandAsyncService.java
+++ b/redisson/src/main/java/org/redisson/command/CommandAsyncService.java
@ -938,7 +938,8 @@ public class CommandAsyncService implements CommandAsyncExecutor {
        TimerTask timeoutTask = new TimerTask() {
            @Override
            public void run(Timeout timeout) throws Exception {
-                if (details.getAttempt() < connectionManager.getConfig().getRetryAttempts()) {
+                if (!details.getAttemptPromise().isDone() 
+                        && details.getAttempt() < connectionManager.getConfig().getRetryAttempts()) {
                    if (!details.getAttemptPromise().cancel(false)) {
                        return;
                    }