android/okhttp
1
0
Fork 0
mirror of https://github.com/square/okhttp.git synced 2026-01-15 20:56:41 +03:00
Code Releases Activity

Merge pull request #2816 from square/jwilson.0828.upgrade

Browse Source 
Upgrade to Okio 1.10.
This commit is contained in:
Jake Wharton
2016-09-13 17:37:41 -04:00
committed by GitHub
parent 413323f10d ba1edd048e
commit df0ff817c8
2 changed files with 4 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
okhttp/src/main/java/okhttp3/internal/cache/DiskLruCache.java vendored
View File

@@ -35,13 +35,11 @@ import java.util.regex.Pattern;
import okhttp3.internal.Util;
import okhttp3.internal.io.FileSystem;
import okhttp3.internal.platform.Platform;
import okio.Buffer;
import okio.BufferedSink;
import okio.BufferedSource;
import okio.Okio;
import okio.Sink;
import okio.Source;
import okio.Timeout;
import static okhttp3.internal.platform.Platform.WARN;
@@ -187,7 +185,7 @@ public final class DiskLruCache implements Closeable, Flushable {
}
} catch (IOException e) {
mostRecentRebuildFailed = true;
journalWriter = Okio.buffer(NULL_SINK);
journalWriter = Okio.buffer(Okio.blackhole());
}
}
}
@@ -822,22 +820,6 @@ public final class DiskLruCache implements Closeable, Flushable {
}
}
private static final Sink NULL_SINK = new Sink() {
@Override public void write(Buffer source, long byteCount) throws IOException {
source.skip(byteCount);
}
@Override public void flush() throws IOException {
}
@Override public Timeout timeout() {
return Timeout.NONE;
}
@Override public void close() throws IOException {
}
};
/** Edits the values for an entry. */
public final class Editor {
private final Entry entry;
@@ -899,7 +881,7 @@ public final class DiskLruCache implements Closeable, Flushable {
throw new IllegalStateException();
}
if (entry.currentEditor != this) {
return NULL_SINK;
return Okio.blackhole();
}
if (!entry.readable) {
written[index] = true;
@@ -909,7 +891,7 @@ public final class DiskLruCache implements Closeable, Flushable {
try {
sink = fileSystem.sink(dirtyFile);
} catch (FileNotFoundException e) {
return NULL_SINK;
return Okio.blackhole();
}
return new FaultHidingSink(sink) {
@Override protected void onException(IOException e) {

2
pom.xml
View File

@@ -53,7 +53,7 @@
<guava.version>16.0</guava.version>
<java.version>1.7</java.version>
<moshi.version>1.1.0</moshi.version>
<okio.version>1.9.0</okio.version>
<okio.version>1.10.0</okio.version>
<!-- Test Dependencies -->
<junit.version>4.12</junit.version>