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

Unified Diff: sky/services/oknet/src/org/domokit/oknet/UrlLoaderImpl.java

Issue 1153033010: Make OKNet not throw bananas when asked to parse 'banana'. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 7 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/services/oknet/src/org/domokit/oknet/UrlLoaderImpl.java
diff --git a/sky/services/oknet/src/org/domokit/oknet/UrlLoaderImpl.java b/sky/services/oknet/src/org/domokit/oknet/UrlLoaderImpl.java
index 058023dc08564c0937896dffdf309cc9138f2178..5a23cc1f249bbda907665bdb8df26ab323c7de97 100644
--- a/sky/services/oknet/src/org/domokit/oknet/UrlLoaderImpl.java
+++ b/sky/services/oknet/src/org/domokit/oknet/UrlLoaderImpl.java
@@ -29,6 +29,8 @@ import org.chromium.mojom.mojo.UrlRequest;
import org.chromium.mojom.mojo.UrlResponse;
import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
import java.nio.ByteBuffer;
import java.nio.charset.Charset;
import java.util.concurrent.Executor;
@@ -117,8 +119,23 @@ public class UrlLoaderImpl implements UrlLoader {
mIsLoading = true;
mError = null;
+ URL url = null;
+ try {
+ url = new URL(request.url);
+ } catch (MalformedURLException e) {
+ Log.w(TAG, "Failed to parse url " + request.url);
+ mError = new NetworkError();
+ // TODO(abarth): Which mError.code should we set?
+ mError.description = e.toString();
+ UrlResponse urlResponse = new UrlResponse();
+ urlResponse.url = request.url;
+ urlResponse.error = mError;
+ callback.call(urlResponse);
+ return;
+ }
+
Request.Builder builder =
- new Request.Builder().url(request.url).method(request.method, null);
+ new Request.Builder().url(url).method(request.method, null);
if (request.headers != null) {
for (HttpHeader header : request.headers) {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698