Merge branch 'master' into 3.0.0

redisson/src/main/java/org/redisson/client/handler/CommandDecoder.java

@@ -131,7 +131,7 @@ public class CommandDecoder extends ReplayingDecoder<State> {
                 }
                 sendNext(ctx, data);
             } catch (Exception e) {
-                log.error("Unable to decode data. reply: {}, channel: {}, command: {}", LogHelper.toString(in), ctx.channel(), data, e);
+                log.error("Unable to decode data. channel: " + ctx.channel() + ", reply: " + LogHelper.toString(in) + ", command: " + LogHelper.toString(data), e);
                 cmd.tryFailure(e);
                 sendNext(ctx);
                 throw e;
@@ -152,7 +152,7 @@ public class CommandDecoder extends ReplayingDecoder<State> {
                 }
                 sendNext(ctx);
             } catch (Exception e) {
-                log.error("Unable to decode data. channel: {} message: {}", ctx.channel(), LogHelper.toString(in), e);
+                log.error("Unable to decode data. channel: " + ctx.channel() + ", reply: " + LogHelper.toString(in), e);
                 sendNext(ctx);
                 throw e;
             }

redisson/src/main/java/org/redisson/client/handler/CommandPubSubDecoder.java

@@ -79,7 +79,7 @@ public class CommandPubSubDecoder extends CommandDecoder {
                 }
                 sendNext(ctx);
             } catch (Exception e) {
-                log.error("Unable to decode data. channel: {} message: {}", ctx.channel(), LogHelper.toString(in), e);
+                log.error("Unable to decode data. channel: " + ctx.channel() + ", reply: " + LogHelper.toString(in), e);
                 sendNext(ctx);
                 throw e;
             }
@@ -95,7 +95,7 @@ public class CommandPubSubDecoder extends CommandDecoder {
                 }
                 sendNext(ctx, data);
             } catch (Exception e) {
-                log.error("Unable to decode data. channel: {} message: {}", ctx.channel(), LogHelper.toString(in), e);
+                log.error("Unable to decode data. channel: " + ctx.channel() + ", reply: " + LogHelper.toString(in), e);
                 cmd.tryFailure(e);
                 sendNext(ctx);
                 throw e;

redisson/src/main/java/org/redisson/command/CommandAsyncService.java

@@ -938,8 +938,7 @@ public class CommandAsyncService implements CommandAsyncExecutor {
         TimerTask timeoutTask = new TimerTask() {
             @Override
             public void run(Timeout timeout) throws Exception {
-                if (!details.getAttemptPromise().isDone() 
+                if (details.getAttempt() < connectionManager.getConfig().getRetryAttempts()) {
-                        && details.getAttempt() < connectionManager.getConfig().getRetryAttempts()) {
                     if (!details.getAttemptPromise().cancel(false)) {
                         return;
                     }