From 6ee48594b3154d310c4c5420fe152f8faa084021 Mon Sep 17 00:00:00 2001
From: Nikita Koksharov <nkoksharov@redisson.pro>
Date: Thu, 14 Mar 2019 13:06:49 +0300
Subject: [PATCH] refactoring

---
 .../java/org/redisson/client/handler/CommandDecoder.java  | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/redisson/src/main/java/org/redisson/client/handler/CommandDecoder.java b/redisson/src/main/java/org/redisson/client/handler/CommandDecoder.java
index 192ee2876..433a7c02f 100644
--- a/redisson/src/main/java/org/redisson/client/handler/CommandDecoder.java
+++ b/redisson/src/main/java/org/redisson/client/handler/CommandDecoder.java
@@ -102,17 +102,13 @@ public class CommandDecoder extends ReplayingDecoder<State> {
 
         if (data == null) {
             while (in.writerIndex() > in.readerIndex()) {
-                in.markReaderIndex();
                 skipCommand(in);
-                in.resetReaderIndex();
 
                 decode(ctx, in, data);
             }
         } else {
             if (!(data instanceof CommandsData)) {
-                in.markReaderIndex();
                 skipCommand(in);
-                in.resetReaderIndex();
             }
             
             decode(ctx, in, data);
@@ -155,7 +151,9 @@ public class CommandDecoder extends ReplayingDecoder<State> {
     }
     
     protected void skipCommand(ByteBuf in) throws Exception {
+        in.markReaderIndex();
         skipDecode(in);
+        in.resetReaderIndex();
     }
     
     protected void skipDecode(ByteBuf in) throws IOException{
@@ -245,9 +243,7 @@ public class CommandDecoder extends ReplayingDecoder<State> {
                 checkpoint();
                 state.get().setBatchIndex(i);
                 
-                in.markReaderIndex();
                 skipCommand(in);
-                in.resetReaderIndex();
                 
                 RedisCommand<?> cmd = commandBatch.getCommands().get(i).getCommand();
                 boolean skipConvertor = commandBatch.isQueued();
-- 
GitLab