Merge branch '6.2.x'
This commit is contained in:
commit
cd80ca0fe0
|
@ -124,7 +124,7 @@ final class DataBufferInputStream extends InputStream {
|
||||||
return 0L;
|
return 0L;
|
||||||
}
|
}
|
||||||
int skipped = Math.min(available(), n > Integer.MAX_VALUE ? Integer.MAX_VALUE : (int) n);
|
int skipped = Math.min(available(), n > Integer.MAX_VALUE ? Integer.MAX_VALUE : (int) n);
|
||||||
this.dataBuffer.readPosition(Math.min(this.end, this.dataBuffer.readPosition() + skipped));
|
this.dataBuffer.readPosition(this.dataBuffer.readPosition() + skipped);
|
||||||
return skipped;
|
return skipped;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue