Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1220)

Unified Diff: components/cronet/android/java/src/org/chromium/net/urlconnection/CronetHttpURLConnection.java

Issue 2663063009: [Cronet] Fix CronetHttpURLConnection#getResponse() hang (Closed)
Patch Set: Rename to mHasResponseHeadersOrCompleted Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetFixedModeOutputStreamTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/cronet/android/java/src/org/chromium/net/urlconnection/CronetHttpURLConnection.java
diff --git a/components/cronet/android/java/src/org/chromium/net/urlconnection/CronetHttpURLConnection.java b/components/cronet/android/java/src/org/chromium/net/urlconnection/CronetHttpURLConnection.java
index 0a0d77a0ce760a621eaa816eb686d0f8615fd377..73a688bc0c8fac57a9751863bca3eb7359b60c3f 100644
--- a/components/cronet/android/java/src/org/chromium/net/urlconnection/CronetHttpURLConnection.java
+++ b/components/cronet/android/java/src/org/chromium/net/urlconnection/CronetHttpURLConnection.java
@@ -45,8 +45,9 @@ public class CronetHttpURLConnection extends HttpURLConnection {
private CronetOutputStream mOutputStream;
private UrlResponseInfo mResponseInfo;
private CronetException mException;
- private boolean mOnRedirectCalled = false;
- private boolean mHasResponse = false;
+ private boolean mOnRedirectCalled;
+ // Whether response headers are received, the request is failed, or the request is canceled.
+ private boolean mHasResponseHeadersOrCompleted;
private List<Map.Entry<String, String>> mResponseHeadersList;
private Map<String, List<String>> mResponseHeadersMap;
@@ -437,6 +438,7 @@ public class CronetHttpURLConnection extends HttpURLConnection {
@Override
public void onResponseStarted(UrlRequest request, UrlResponseInfo info) {
mResponseInfo = info;
+ mHasResponseHeadersOrCompleted = true;
// Quits the message loop since we have the headers now.
mMessageLoop.quit();
}
@@ -508,7 +510,7 @@ public class CronetHttpURLConnection extends HttpURLConnection {
if (mOutputStream != null) {
mOutputStream.setRequestCompleted(exception);
}
- mHasResponse = true;
+ mHasResponseHeadersOrCompleted = true;
mMessageLoop.quit();
}
}
@@ -525,13 +527,12 @@ public class CronetHttpURLConnection extends HttpURLConnection {
mOutputStream.close();
}
}
- if (!mHasResponse) {
+ if (!mHasResponseHeadersOrCompleted) {
startRequest();
// Blocks until onResponseStarted or onFailed is called.
mMessageLoop.loop();
- mHasResponse = true;
}
- checkHasResponse();
+ checkHasResponseHeaders();
}
/**
@@ -539,8 +540,8 @@ public class CronetHttpURLConnection extends HttpURLConnection {
* an exception occurred before headers received. This method should only be
* called after onResponseStarted or onFailed.
*/
- private void checkHasResponse() throws IOException {
- if (!mHasResponse) throw new IllegalStateException("No response.");
+ private void checkHasResponseHeaders() throws IOException {
+ if (!mHasResponseHeadersOrCompleted) throw new IllegalStateException("No response.");
if (mException != null) {
throw mException;
} else if (mResponseInfo == null) {
« no previous file with comments | « no previous file | components/cronet/android/test/javatests/src/org/chromium/net/urlconnection/CronetFixedModeOutputStreamTest.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698