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

Attempt to guard against ExoCache corruption.

Browse source
This commit is contained in:
Oliver Woodman 2015-04-10 22:33:10 +01:00
parent cfcbca6c95
commit ed658b8e8d
3 changed files with 35 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
library/src/main/java/com/google/android/exoplayer/upstream/TeeDataSource.java
View file

@ -61,8 +61,11 @@ public final class TeeDataSource implements DataSource {
@Override @Override
public void close() throws IOException { public void close() throws IOException {
upstream.close(); try {
dataSink.close(); upstream.close();
} finally {
dataSink.close();
}
} }
} }

19
library/src/main/java/com/google/android/exoplayer/upstream/cache/CacheDataSink.java vendored
View file

@ -19,6 +19,7 @@ import com.google.android.exoplayer.C;
import com.google.android.exoplayer.upstream.DataSink; import com.google.android.exoplayer.upstream.DataSink;
import com.google.android.exoplayer.upstream.DataSpec; import com.google.android.exoplayer.upstream.DataSpec;
import com.google.android.exoplayer.util.Assertions; import com.google.android.exoplayer.util.Assertions;
import com.google.android.exoplayer.util.Util;
import java.io.File; import java.io.File;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
@ -115,11 +116,23 @@ public class CacheDataSink implements DataSink {
} }
private void closeCurrentOutputStream() throws IOException { private void closeCurrentOutputStream() throws IOException {
if (outputStream != null) { if (outputStream == null) {
return;
}
boolean success = false;
try {
outputStream.flush(); outputStream.flush();
outputStream.close(); outputStream.getFD().sync();
success = true;
} finally {
Util.closeQuietly(outputStream);
if (success) {
cache.commitFile(file);
} else {
file.delete();
}
outputStream = null; outputStream = null;
cache.commitFile(file);
file = null; file = null;
} }
} }

14
library/src/main/java/com/google/android/exoplayer/util/Util.java
View file

@ -22,6 +22,7 @@ import android.text.TextUtils;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStream;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.net.HttpURLConnection; import java.net.HttpURLConnection;
@ -129,6 +130,19 @@ public final class Util {
} }
} }
/**
* Closes an {@link OutputStream}, suppressing any {@link IOException} that may occur.
*
* @param outputStream The {@link OutputStream} to close.
*/
public static void closeQuietly(OutputStream outputStream) {
try {
outputStream.close();
} catch (IOException e) {
// Ignore.
}
}
/** /**
* Converts text to lower case using {@link Locale#US}. * Converts text to lower case using {@link Locale#US}.
* *