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

Unified Diff: dart/runtime/bin/builtin.dart

Issue 1011033003: Fix buildbot on trunk: (Closed) Base URL: http://dart.googlecode.com/svn/trunk/
Patch Set: Created 5 years, 9 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 | dart/tests/language/language.status » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: dart/runtime/bin/builtin.dart
===================================================================
--- dart/runtime/bin/builtin.dart (revision 44531)
+++ dart/runtime/bin/builtin.dart (working copy)
@@ -350,7 +350,7 @@
_finishedOneLoadRequest(uri);
}
-void _asyncLoadError(int tag, String uri, String libraryUri, LoadError error) {
+void _asyncLoadError(tag, uri, libraryUri, error) {
if (_logBuiltin) {
_print("_asyncLoadError($uri), error: $error");
}
@@ -359,7 +359,7 @@
// uri.
libraryUri = uri;
}
- _asyncLoadErrorCallback(uri, libraryUri, error);
+ _asyncLoadErrorCallback(uri, libraryUri, new LoadError(error.toString()));
_finishedOneLoadRequest(uri);
}
@@ -373,15 +373,10 @@
if (dataOrError is List<int>) {
_loadScript(tag, uri, libraryUri, dataOrError);
} else {
- assert(dataOrError is String);
- var error = new LoadError(dataOrError.toString());
- _asyncLoadError(tag, uri, libraryUri, error);
+ _asyncLoadError(tag, uri, libraryUri, dataOrError);
}
}).catchError((e) {
- // Wrap inside a LoadError unless we are already propagating a previously
- // seen LoadError.
- var error = (e is LoadError) ? e : new LoadError(e.toString);
- _asyncLoadError(tag, uri, libraryUri, error);
+ _asyncLoadError(tag, uri, libraryUri, e.toString());
});
try {
@@ -392,10 +387,7 @@
if (_logBuiltin) {
_print("Exception when communicating with service isolate: $e");
}
- // Wrap inside a LoadError unless we are already propagating a previously
- // seen LoadError.
- var error = (e is LoadError) ? e : new LoadError(e.toString);
- _asyncLoadError(tag, uri, libraryUri, error);
+ _asyncLoadError(tag, uri, libraryUri, e.toString());
receivePort.close();
}
}
« no previous file with comments | « no previous file | dart/tests/language/language.status » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698