sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Throw correct exception.

Browse source
This commit is contained in:
Oliver Woodman 2015-11-25 16:48:45 +00:00
parent 042bd2ff82
commit 4fbe4fc7d5
1 changed files with 37 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
library/src/main/java/com/google/android/exoplayer/upstream/cache/CacheDataSource.java vendored
View file

@ -27,6 +27,7 @@ import android.net.Uri;
import android.util.Log; import android.util.Log;
import java.io.IOException; import java.io.IOException;
import java.io.InterruptedIOException;
/** /**
* A {@link DataSource} that reads and writes a {@link Cache}. Requests are fulfilled from the cache * A {@link DataSource} that reads and writes a {@link Cache}. Requests are fulfilled from the cache
@ -182,7 +183,6 @@ public final class CacheDataSource implements DataSource {
* opened to read from the upstream source and write into the cache. * opened to read from the upstream source and write into the cache.
*/ */
private void openNextSource() throws IOException { private void openNextSource() throws IOException {
try {
DataSpec dataSpec; DataSpec dataSpec;
CacheSpan span; CacheSpan span;
if (ignoreCache) { if (ignoreCache) {
@ -193,7 +193,11 @@ public final class CacheDataSource implements DataSource {
Log.w(TAG, "Cache bypassed due to unbounded length."); Log.w(TAG, "Cache bypassed due to unbounded length.");
span = null; span = null;
} else if (blockOnCache) { } else if (blockOnCache) {
try {
span = cache.startReadWrite(key, readPosition); span = cache.startReadWrite(key, readPosition);
} catch (InterruptedException e) {
throw new InterruptedIOException();
}
} else { } else {
span = cache.startReadWriteNonBlocking(key, readPosition); span = cache.startReadWriteNonBlocking(key, readPosition);
} }
@ -218,10 +222,6 @@ public final class CacheDataSource implements DataSource {
: upstreamDataSource; : upstreamDataSource;
} }
currentDataSource.open(dataSpec); currentDataSource.open(dataSpec);
} catch (InterruptedException e) {
// Should never happen.
throw new RuntimeException(e);
}
} }
private void closeCurrentSource() throws IOException { private void closeCurrentSource() throws IOException {