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

Fixed a bug where the newly added padding has wrong writeIndex

Browse Source
This commit is contained in:
Trustin Lee 2009-10-13 08:51:25 +00:00
parent ed27ca19ea
commit d3488a1852
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/org/jboss/netty/buffer/CompositeChannelBuffer.java
View File

@ -148,10 +148,6 @@ public class CompositeChannelBuffer extends AbstractChannelBuffer {
assert c.readerIndex() == 0; assert c.readerIndex() == 0;
assert c.writerIndex() == c.capacity(); assert c.writerIndex() == c.capacity();
if (c.writerIndex() != c.capacity()) {
System.err.println(c);
throw new Error();
}
components[i] = c; components[i] = c;
} }
@ -675,7 +671,9 @@ public class CompositeChannelBuffer extends AbstractChannelBuffer {
// Add a new buffer so that the capacity of this composite buffer does // Add a new buffer so that the capacity of this composite buffer does
// not decrease due to the discarded components. // not decrease due to the discarded components.
// XXX Might create too many components if discarded by small amount. // XXX Might create too many components if discarded by small amount.
list.add(ChannelBuffers.buffer(order(), localReaderIndex)); final ChannelBuffer padding = ChannelBuffers.buffer(order(), localReaderIndex);
padding.writerIndex(localReaderIndex);
list.add(padding);
// Reset the index markers to get the index marker values. // Reset the index markers to get the index marker values.
int localMarkedReaderIndex = localReaderIndex; int localMarkedReaderIndex = localReaderIndex;