diff options
author | Narayan Kamath <narayan@google.com> | 2013-07-18 13:21:47 +0100 |
---|---|---|
committer | Narayan Kamath <narayan@google.com> | 2013-07-18 13:36:13 +0100 |
commit | a82f42bbeedd0b07f3892f3b0efaa8122dc8f264 (patch) | |
tree | e508857d2203d128b780e594f3a6a63d52f18cbf /src/main/java/com/squareup/okhttp/internal/spdy | |
parent | 00834c9a00d53b29c6e486cb0b6f80fd505416e1 (diff) | |
download | okhttp-a82f42bbeedd0b07f3892f3b0efaa8122dc8f264.tar.gz |
Update okhttp to commit abc8c9a30bc0c5a9a
Change-Id: I5331e760f09aaae0a267c50829f01eb7a68d76e1
Diffstat (limited to 'src/main/java/com/squareup/okhttp/internal/spdy')
3 files changed, 7 insertions, 6 deletions
diff --git a/src/main/java/com/squareup/okhttp/internal/spdy/SpdyConnection.java b/src/main/java/com/squareup/okhttp/internal/spdy/SpdyConnection.java index b8d2ff5..d3a3c9c 100644 --- a/src/main/java/com/squareup/okhttp/internal/spdy/SpdyConnection.java +++ b/src/main/java/com/squareup/okhttp/internal/spdy/SpdyConnection.java @@ -446,9 +446,8 @@ public final class SpdyConnection implements Closeable { } } - @Override - public void synStream(int flags, int streamId, int associatedStreamId, int priority, int slot, - List<String> nameValueBlock) { + @Override public void synStream(int flags, int streamId, int associatedStreamId, int priority, + int slot, List<String> nameValueBlock) { final SpdyStream synStream; final SpdyStream previous; synchronized (SpdyConnection.this) { diff --git a/src/main/java/com/squareup/okhttp/internal/spdy/SpdyReader.java b/src/main/java/com/squareup/okhttp/internal/spdy/SpdyReader.java index 7d3f2bd..c4f60ab 100644 --- a/src/main/java/com/squareup/okhttp/internal/spdy/SpdyReader.java +++ b/src/main/java/com/squareup/okhttp/internal/spdy/SpdyReader.java @@ -222,8 +222,8 @@ final class SpdyReader implements Closeable { // Subclass inflater to install a dictionary when it's needed. Inflater inflater = new Inflater() { - @Override - public int inflate(byte[] buffer, int offset, int count) throws DataFormatException { + @Override public int inflate(byte[] buffer, int offset, int count) + throws DataFormatException { int result = super.inflate(buffer, offset, count); if (result == 0 && needsDictionary()) { setDictionary(DICTIONARY); diff --git a/src/main/java/com/squareup/okhttp/internal/spdy/SpdyStream.java b/src/main/java/com/squareup/okhttp/internal/spdy/SpdyStream.java index 744a04e..a6b39be 100644 --- a/src/main/java/com/squareup/okhttp/internal/spdy/SpdyStream.java +++ b/src/main/java/com/squareup/okhttp/internal/spdy/SpdyStream.java @@ -670,7 +670,9 @@ public final class SpdyStream { } closed = true; } - writeFrame(true); + if (!out.finished) { + writeFrame(true); + } connection.flush(); cancelStreamIfNecessary(); } |