Fixed - BZMPOP command timeout isn't applied

redisson/src/main/java/org/redisson/client/protocol/RedisCommands.java

@@ -282,7 +282,7 @@ public interface RedisCommands {
     RedisCommand<List<Object>> BLPOP = new RedisCommand<List<Object>>("BLPOP", new ObjectListReplayDecoder<Object>());
     RedisCommand<List<Object>> BRPOP = new RedisCommand<List<Object>>("BRPOP", new ObjectListReplayDecoder<Object>());
     RedisCommand<Map<String, Map<Object, Double>>> BZMPOP = new RedisCommand<>("BZMPOP", ZMPOP.getReplayMultiDecoder());
-    RedisCommand<List<Object>> BZMPOP_SINGLE_LIST = new RedisCommand<>("BZMPOP", ZMPOP_VALUES.getReplayMultiDecoder());
+    RedisCommand<List<Object>> BZMPOP_SINGLE_LIST = new RedisCommand("BZMPOP", ZMPOP_VALUES.getReplayMultiDecoder(), new EmptyListConvertor());
     RedisCommand<Object> BLPOP_VALUE = new RedisCommand<Object>("BLPOP", new ListObjectDecoder<Object>(1));
     RedisCommand<Object> BLMOVE = new RedisCommand<Object>("BLMOVE");
     RedisCommand<Object> BRPOP_VALUE = new RedisCommand<Object>("BRPOP", new ListObjectDecoder<Object>(1));

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

@@ -378,7 +378,11 @@ public class RedisExecutor<V, R> {
                     }
                 }
             } else {
-                popTimeout = Long.valueOf(params[params.length - 1].toString()) * 1000;
+                if (RedisCommands.BZMPOP.getName().equals(command.getName())) {
+                    popTimeout = Long.valueOf(params[0].toString()) * 1000;
+                } else {
+                    popTimeout = Long.valueOf(params[params.length - 1].toString()) * 1000;
+                }
             }
 
             handleBlockingOperations(attemptPromise, connection, popTimeout);