From 3db2deef3af0e3132adb4503ea57eb8da4a75684 Mon Sep 17 00:00:00 2001 From: Nikita Date: Tue, 13 Feb 2018 06:19:11 +0300 Subject: [PATCH] Fixed - Warning about CommandDecoder.decode() method #1295 --- .../java/org/redisson/client/handler/CommandDecoder.java | 7 +++++-- .../main/java/org/redisson/client/protocol/Decoder.java | 6 ++++++ 2 files changed, 11 insertions(+), 2 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 1aa24fdfe..169018023 100644 --- a/redisson/src/main/java/org/redisson/client/handler/CommandDecoder.java +++ b/redisson/src/main/java/org/redisson/client/handler/CommandDecoder.java @@ -93,7 +93,7 @@ public class CommandDecoder extends ReplayingDecoder { if (data == null) { while (in.writerIndex() > in.readerIndex()) { - decode(in, null, null, ctx.channel()); + decode(in, null, null, ctx.channel()); } } else if (data instanceof CommandData) { CommandData cmd = (CommandData)data; @@ -105,6 +105,7 @@ public class CommandDecoder extends ReplayingDecoder { } } catch (Exception e) { cmd.tryFailure(e); + throw e; } } else if (data instanceof CommandsData) { CommandsData commands = (CommandsData)data; @@ -112,6 +113,7 @@ public class CommandDecoder extends ReplayingDecoder { decodeCommandBatch(ctx, in, data, commands); } catch (Exception e) { commands.getPromise().tryFailure(e); + throw e; } return; } @@ -172,7 +174,7 @@ public class CommandDecoder extends ReplayingDecoder { } private void decodeCommandBatch(ChannelHandlerContext ctx, ByteBuf in, QueueCommand data, - CommandsData commandBatch) { + CommandsData commandBatch) throws Exception { int i = state().getBatchIndex(); Throwable error = null; @@ -211,6 +213,7 @@ public class CommandDecoder extends ReplayingDecoder { } } catch (Exception e) { commandData.tryFailure(e); + throw e; } i++; if (commandData != null && !commandData.isSuccess()) { diff --git a/redisson/src/main/java/org/redisson/client/protocol/Decoder.java b/redisson/src/main/java/org/redisson/client/protocol/Decoder.java index 18a8aaf78..7cda2f9a5 100644 --- a/redisson/src/main/java/org/redisson/client/protocol/Decoder.java +++ b/redisson/src/main/java/org/redisson/client/protocol/Decoder.java @@ -21,6 +21,12 @@ import org.redisson.client.handler.State; import io.netty.buffer.ByteBuf; +/** + * + * @author Nikita Koksharov + * + * @param result type + */ public interface Decoder { R decode(ByteBuf buf, State state) throws IOException;