Commit aa6ead3d by olly Committed by Oliver Woodman

seenCacheError should be set for all errors

PiperOrigin-RevId: 265662686
parent 9ca5b0fc
......@@ -285,7 +285,7 @@ public final class CacheDataSource implements DataSource {
}
openNextSource(false);
return bytesRemaining;
} catch (IOException e) {
} catch (Throwable e) {
handleBeforeThrow(e);
throw e;
}
......@@ -327,6 +327,9 @@ public final class CacheDataSource implements DataSource {
}
handleBeforeThrow(e);
throw e;
} catch (Throwable e) {
handleBeforeThrow(e);
throw e;
}
}
......@@ -353,7 +356,7 @@ public final class CacheDataSource implements DataSource {
notifyBytesRead();
try {
closeCurrentSource();
} catch (IOException e) {
} catch (Throwable e) {
handleBeforeThrow(e);
throw e;
}
......@@ -520,7 +523,7 @@ public final class CacheDataSource implements DataSource {
}
}
private void handleBeforeThrow(IOException exception) {
private void handleBeforeThrow(Throwable exception) {
if (isReadingFromCache() || exception instanceof CacheException) {
seenCacheError = true;
}
......
......@@ -359,7 +359,7 @@ public final class CacheUtil {
}
}
/*package*/ static boolean isCausedByPositionOutOfRange(IOException e) {
/* package */ static boolean isCausedByPositionOutOfRange(IOException e) {
Throwable cause = e;
while (cause != null) {
if (cause instanceof DataSourceException) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment