diff options
| author | Tobias Thierer <tobiast@google.com> | 2017-01-25 10:43:38 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-01-25 10:43:38 +0000 |
| commit | 3e1f83e9f56e985728fea646978f75061e9c19b3 (patch) | |
| tree | 596aea6e32250865c9141c116649bd83e5a95c6f | |
| parent | 5515db3267df8a625433f4f84acda9871744e7e8 (diff) | |
| parent | 66ef890399e4ff8c6f4b805f8b2a23ac2520bd83 (diff) | |
| download | okhttp-3e1f83e9f56e985728fea646978f75061e9c19b3.tar.gz | |
Merge "OkHttp quick fix: canceled StreamAllocations can never recover" am: 390c78c5cd
am: 66ef890399
Change-Id: I32e1850f51651f5ed18c7c52e0ef267eab9dbf96
| -rw-r--r-- | okhttp/src/main/java/com/squareup/okhttp/internal/http/StreamAllocation.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/okhttp/src/main/java/com/squareup/okhttp/internal/http/StreamAllocation.java b/okhttp/src/main/java/com/squareup/okhttp/internal/http/StreamAllocation.java index 7d95338..fd3f03f 100644 --- a/okhttp/src/main/java/com/squareup/okhttp/internal/http/StreamAllocation.java +++ b/okhttp/src/main/java/com/squareup/okhttp/internal/http/StreamAllocation.java @@ -314,6 +314,10 @@ public final class StreamAllocation { } public boolean recover(RouteException e) { + // Android-changed: Canceled StreamAllocations can never recover http://b/33763156 + if (canceled) { + return false; + } if (connection != null) { connectionFailed(e.getLastConnectException()); } |