Chromium Code Reviews| Index: runtime/lib/isolate.cc |
| =================================================================== |
| --- runtime/lib/isolate.cc (revision 3219) |
| +++ runtime/lib/isolate.cc (working copy) |
| @@ -206,9 +206,9 @@ |
| } else { |
| Zone zone(isolate); |
| HandleScope handle_scope(isolate); |
| - const String& error = String::Handle( |
| + const Error& error = Error::Handle( |
| Isolate::Current()->object_store()->sticky_error()); |
| - const char* errmsg = error.ToCString(); |
| + const char* errmsg = error.ToErrorCString(); |
| OS::PrintErr("%s\n", errmsg); |
| exit(255); |
| } |
| @@ -230,16 +230,18 @@ |
| name ^= String::NewSymbol(library_url); |
| const Library& lib = Library::Handle(Library::LookupLibrary(name)); |
| if (lib.IsNull()) { |
| - const String& error = String::Handle( |
| + const String& error_str = String::Handle( |
| String::New("Error starting Isolate, library not loaded : ")); |
| + const Error& error = Error::Handle(LanguageError::New(error_str)); |
| Isolate::Current()->object_store()->set_sticky_error(error); |
| return false; |
| } |
| name ^= String::NewSymbol(class_name); |
| const Class& target_class = Class::Handle(lib.LookupClass(name)); |
| if (target_class.IsNull()) { |
| - const String& error = String::Handle( |
| + const String& error_str = String::Handle( |
| String::New("Error starting Isolate, class not loaded : ")); |
| + const Error& error = Error::Handle(LanguageError::New(error_str)); |
| Isolate::Current()->object_store()->set_sticky_error(error); |
| return false; |
| } |
| @@ -286,9 +288,9 @@ |
| { |
| Zone zone(spawned_isolate); |
| HandleScope scope(spawned_isolate); |
| - const String& errmsg = String::Handle( |
| + const Error& errobj = Error::Handle( |
|
hausner
2012/01/13 01:49:06
err_obj?
turnidge
2012/01/17 19:53:46
Done.
|
| spawned_isolate->object_store()->sticky_error()); |
| - error = strdup(errmsg.ToCString()); |
| + error = strdup(errobj.ToErrorCString()); |
| } |
| Dart::ShutdownIsolate(); |
| spawned_isolate = NULL; |