Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change I499a9541 into eclair-mr2

Browse Source 
* changes:
  setupRedirect() can throw. Catch it and signal the error.
This commit is contained in:
Android (Google) Code Review
2009-10-02 16:28:11 -04:00
parent 86806ce11a 499a954182
commit 9eca703d08
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/android/webkit/LoadListener.java
View File

@@ -1211,8 +1211,17 @@ class LoadListener extends Handler implements EventHandler {
// mRequestHandle can be null when the request was satisfied
// by the cache, and the cache returned a redirect
if (mRequestHandle != null) {
mRequestHandle.setupRedirect(mUrl, mStatusCode,
mRequestHeaders);
try {
mRequestHandle.setupRedirect(mUrl, mStatusCode,
mRequestHeaders);
} catch(RuntimeException e) {
Log.e(LOGTAG, e.getMessage());
// Signal a bad url error if we could not load the
// redirection.
handleError(EventHandler.ERROR_BAD_URL,
mContext.getString(R.string.httpErrorBadUrl));
return;
}
} else {
// If the original request came from the cache, there is no
// RequestHandle, we have to create a new one through