Backups/TwelveMonkeys
2
0
Fork 0
mirror of https://github.com/haraldk/TwelveMonkeys.git synced 2025-08-02 11:05:29 -04:00
Code Issues Projects Releases Wiki Activity

Fixed bugs in Seekable implementations.

Browse Source
This commit is contained in:
Harald Kuhr 2011-10-20 18:10:29 +02:00
parent cee29fb6a1
commit 0e11d6e2ae
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/common-io/src/main/java/com/twelvemonkeys/io/AbstractCachedSeekableStream.java
View File

@ -138,7 +138,7 @@ abstract class AbstractCachedSeekableStream extends SeekableInputStream {
} }
} }
} }
else if (streamPosition >= pPosition) { else /*if (streamPosition >= pPosition) */ {
// Seek backwards into the cache // Seek backwards into the cache
cache.seek(pPosition); cache.seek(pPosition);
} }

20
common/common-io/src/main/java/com/twelvemonkeys/io/SeekableInputStream.java
View File

@ -69,15 +69,27 @@ public abstract class SeekableInputStream extends InputStream implements Seekabl
* @throws IOException if an I/O exception occurs during skip * @throws IOException if an I/O exception occurs during skip
*/ */
@Override @Override
public final long skip(long pLength) throws IOException { public final long skip(final long pLength) throws IOException {
long pos = position; long pos = position;
if (pos + pLength < flushedPosition) { long wantedPosition = pos + pLength;
if (wantedPosition < flushedPosition) {
throw new IOException("position < flushedPosition"); throw new IOException("position < flushedPosition");
} }
// Stop at stream length for compatibility, even though it's allowed // Stop at stream length for compatibility, even though it might be allowed
// to seek past end of stream // to seek past end of stream
seek(Math.min(pos + pLength, pos + available())); int available = available();
if (available > 0) {
seek(Math.min(wantedPosition, pos + available));
}
// TODO: Add optimization for streams with known length!
else {
// Slow mode...
int toSkip = (int) Math.max(Math.min(pLength, 512), -512);
while (toSkip > 0 && read() >= 0) {
toSkip--;
}
}
return position - pos; return position - pos;
} }