archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 23:34:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8227609: (fs) Files.newInputStream(...).skip(n) should allow skipping beyond file size

Browse source 
Reviewed-by: alanb, lancea, fweimer
This commit is contained in:
Brian Burkhalter 2019-07-30 09:46:06 -07:00
parent 918492bb58
commit 3155cd829b
3 changed files with 142 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/java.base/share/classes/sun/nio/ch/ChannelInputStream.java
View file

@ -119,20 +119,21 @@ public class ChannelInputStream
public synchronized long skip(long n) throws IOException {
// special case where the channel is to a file
if (ch instanceof SeekableByteChannel && n > 0) {
if (ch instanceof SeekableByteChannel) {
SeekableByteChannel sbc = (SeekableByteChannel)ch;
try {
long pos = sbc.position();
long pos = sbc.position();
long newPos;
if (n > 0) {
newPos = pos + n;
long size = sbc.size();
if (pos >= size) {
return 0L;
if (newPos < 0 || newPos > size) {
newPos = size;
}
n = Math.min(n, size - pos);
sbc.position(pos + n);
return sbc.position() - pos;
} catch (ClosedChannelException cce) {
throw new IOException(cce);
} else {
newPos = Long.max(pos + n, 0);
}
sbc.position(newPos);
return newPos - pos;
}
return super.skip(n);
}