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

fix #360, add check for empty buffer; also add unit test for this scenario

Browse Source
This commit is contained in:
Sun Ning 2012-05-24 14:33:19 +08:00
parent c37496311c
commit a6d7105761
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
buffer/src/main/java/io/netty/buffer/ChannelBufferInputStream.java
View File

@ -195,7 +195,8 @@ public class ChannelBufferInputStream extends InputStream implements DataInput {
lineBuf.append((char) b);
}
while (lineBuf.charAt(lineBuf.length() - 1) == '\r') {
while ( lineBuf.length() > 0 &&
lineBuf.charAt(lineBuf.length() - 1) == '\r') {
lineBuf.setLength(lineBuf.length() - 1);
}

11
buffer/src/test/java/io/netty/buffer/ChannelBufferStreamTest.java
View File

@ -168,4 +168,15 @@ public class ChannelBufferStreamTest {
assertEquals(buf.readerIndex(), in.readBytes());
}
@Test
public void testEmptyReadLine() throws Exception {
ChannelBuffer buf = ChannelBuffers.buffer(0);
ChannelBufferInputStream in = new ChannelBufferInputStream(buf);
String s = in.readLine();
assertEquals(0, s.length());
in.close();
}
}