ed078614cd7c89aae39dce0615f8cbbf955b2a90 |
|
12-Jun-2015 |
Neil Fuller <nfuller@google.com> |
Apply upstream changes for timeout / pooled connection issue This change contains two upstream commits: Okio: Upstream commit: a4aee7d9594a2eae48cd274163003e0566719b91 Author: jwilson <jwilson@squareup.com> Date: Sat May 16 08:19:39 2015 -0400 Change Timeout.throwIfReached() to throw InterruptedIOException Previously this was throwing IOException, but nothing was anticipated that. This is slightly semantically incorrect; the thread wasn't interrupted. But it's much more convenient to use a single exception type for both timeouts. Also add a new type, ForwardingTimeout. OkHttp: Upstream commit: 4df674f8c5e2c07d881b4f2780922c7d15940814 Author: jwilson <jwilson@squareup.com> Date: Sat May 16 10:35:59 2015 -0400 Don't share timeouts between pooled connections. This was causing crashes. Closes https://github.com/square/okio/issues/133 Bug: 21799272 Change-Id: I6f38fa8aae7dfaa74361500b75ecd09f41eb1f91
/external/okhttp/okio/okio/src/main/java/okio/ForwardingTimeout.java
|