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

First part of fix for issue #569

Browse Source 
When moving to take into account arrayOffset, it should have been taken into account also in setReadPosition and other places. Fix it now...
This commit is contained in:
Frédéric Brégier 2012-08-28 16:23:35 +03:00
parent 8b4f593397
commit a3cedc8b47
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/org/jboss/netty/handler/codec/http/multipart/HttpPostBodyUtil.java
View File

@ -135,6 +135,8 @@ final class HttpPostBodyUtil {
int pos; int pos;
int origPos;
int limit; int limit;
ChannelBuffer buffer; ChannelBuffer buffer;
@ -148,7 +150,8 @@ final class HttpPostBodyUtil {
} }
this.buffer = buffer; this.buffer = buffer;
bytes = buffer.array(); bytes = buffer.array();
pos = readerIndex = buffer.arrayOffset() + buffer.readerIndex(); readerIndex = buffer.readerIndex();
origPos = pos = buffer.arrayOffset() + readerIndex;
limit = buffer.arrayOffset() + buffer.writerIndex(); limit = buffer.arrayOffset() + buffer.writerIndex();
} }
@ -159,10 +162,19 @@ final class HttpPostBodyUtil {
*/ */
void setReadPosition(int minus) { void setReadPosition(int minus) {
pos -= minus; pos -= minus;
readerIndex = pos; readerIndex = getReadPosition(pos);
buffer.readerIndex(readerIndex); buffer.readerIndex(readerIndex);
} }
/**
*
* @param index raw index of the array (pos in general)
* @return the value equivalent of raw index to be used in readerIndex(value)
*/
int getReadPosition(int index) {
return index - origPos + readerIndex;
}
void clear() { void clear() {
buffer = null; buffer = null;
bytes = null; bytes = null;