andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix decoding null bulk string of RedisDecoder

Browse Source 
Motivation:

- `RedisBulkStringAggregator` raises errors for multiple null bulk strings.
- Null or empty bulk string has no content, but current `RedisDecoder` generates header and contents.

Modifications:

- Fix decoding null bulk string of `RedisDecoder` for `RedisBulkStringAggregator`.

Result:

- Fixes #5184.
This commit is contained in:
Jongyeol Choi 2016-04-30 17:36:24 +09:00 committed by Norman Maurer
parent 6b427aaee5
commit 7db9f454fe
4 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
codec-redis/src/main/java/io/netty/handler/codec/redis/BulkStringHeaderRedisMessage.java
View File

@ -28,6 +28,9 @@ public class BulkStringHeaderRedisMessage implements RedisMessage {
* @param bulkStringLength follow content length.
*/
public BulkStringHeaderRedisMessage(int bulkStringLength) {
if (bulkStringLength <= 0) {
throw new RedisCodecException("bulkStringLength: " + bulkStringLength + " (expected: > 0)");
}
this.bulkStringLength = bulkStringLength;
}

9
codec-redis/src/main/java/io/netty/handler/codec/redis/RedisBulkStringAggregator.java
View File

@ -93,13 +93,6 @@ public final class RedisBulkStringAggregator extends MessageAggregator<RedisMess
@Override
protected FullBulkStringRedisMessage beginAggregation(BulkStringHeaderRedisMessage start, ByteBuf content)
throws Exception {
switch (start.bulkStringLength()) {
case RedisConstants.NULL_VALUE:
return FullBulkStringRedisMessage.NULL_INSTANCE;
case 0:
return FullBulkStringRedisMessage.EMPTY_INSTANCE;
default:
return new FullBulkStringRedisMessage(content);
}
return new FullBulkStringRedisMessage(content);
}
}

8
codec-redis/src/main/java/io/netty/handler/codec/redis/RedisDecoder.java
View File

@ -163,15 +163,14 @@ public final class RedisDecoder extends ByteToMessageDecoder {
RedisConstants.REDIS_MESSAGE_MAX_LENGTH + ")");
}
remainingBulkLength = (int) length; // range(int) is already checked.
out.add(new BulkStringHeaderRedisMessage(remainingBulkLength));
return decodeBulkString(remainingBulkLength, in, out);
return decodeBulkString(in, out);
default:
throw new RedisCodecException("bad type: " + type);
}
}
private boolean decodeBulkString(int length, ByteBuf in, List<Object> out) throws Exception {
switch (length) {
private boolean decodeBulkString(ByteBuf in, List<Object> out) throws Exception {
switch (remainingBulkLength) {
case RedisConstants.NULL_VALUE: // $-1\r\n
out.add(FullBulkStringRedisMessage.NULL_INSTANCE);
resetDecoder();
@ -180,6 +179,7 @@ public final class RedisDecoder extends ByteToMessageDecoder {
state = State.DECODE_BULK_STRING_EOL;
return decodeBulkStringEndOfLine(in, out);
default: // expectedBulkLength is always positive.
out.add(new BulkStringHeaderRedisMessage(remainingBulkLength));
state = State.DECODE_BULK_STRING_CONTENT;
return decodeBulkStringContent(in, out);
}

15
codec-redis/src/test/java/io/netty/handler/codec/redis/RedisDecoderTest.java
View File

@ -153,11 +153,20 @@ public class RedisDecoderTest {
assertFalse(channel.writeInbound(byteBufOf(Integer.toString(-1))));
assertTrue(channel.writeInbound(byteBufOf("\r\n")));
FullBulkStringRedisMessage msg = channel.readInbound();
assertTrue(channel.writeInbound(byteBufOf("$")));
assertTrue(channel.writeInbound(byteBufOf(Integer.toString(-1))));
assertTrue(channel.writeInbound(byteBufOf("\r\n")));
assertThat(msg.isNull(), is(true));
FullBulkStringRedisMessage msg1 = channel.readInbound();
assertThat(msg1.isNull(), is(true));
ReferenceCountUtil.release(msg1);
ReferenceCountUtil.release(msg);
FullBulkStringRedisMessage msg2 = channel.readInbound();
assertThat(msg2.isNull(), is(true));
ReferenceCountUtil.release(msg2);
FullBulkStringRedisMessage msg3 = channel.readInbound();
assertThat(msg3, is(nullValue()));
}
@Test