ziver/hal
1
1
Fork 0
Code Pull requests Releases Activity

Added mark support to boundary stream and that fixed hasNext() in multipart

Browse source
This commit is contained in:
Ziver Koc 2016-07-15 16:48:47 +02:00
parent 99973b7c98
commit 52deb4b16d
5 changed files with 209 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/zutil/net/http/multipart/MultipartParser.java
View file

@ -107,11 +107,24 @@ public class MultipartParser implements Iterable<MultipartField>{
/**
* TODO: there is a bug where this returns true after the last MultiPart as it cannot read ahead. So use next() != null instead
* @return if there is more data after the closest boundary.
* Note that if all data until the next boundary has
* not been read then this method can only estimate
* if there is a next element as the next boundary or
* end of stream might be out of reach.
*/
@Override
public boolean hasNext() {
try {
// check is the last characters are "--"
if (boundaryIn.hasNext() && boundaryIn.isOnBoundary()) {
boundaryIn.mark(delimiter.length() + 10);
boundaryIn.next();
boolean ret = ! ('-' == boundaryIn.read() && '-' == boundaryIn.read());
boundaryIn.reset();
return ret;
}
// Or just guess
return boundaryIn.hasNext();
} catch (IOException e) {
logger.log(Level.SEVERE, null, e);