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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: runtime/vm/service_isolate.cc

Issue 1406013004: Fixes shutdown crashes. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 5 years, 2 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
« runtime/bin/dbg_message.cc ('K') | « runtime/bin/dbg_message.cc ('k') | runtime/vm/virtual_memory.h » ('j') | runtime/vm/virtual_memory.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/service_isolate.cc
diff --git a/runtime/vm/service_isolate.cc b/runtime/vm/service_isolate.cc
index bd73eb83ddb3e360514f00c6745f101245c35dbf..1957b1b79cfec33fe9c90a8dba1f0a6575ee4de7 100644
--- a/runtime/vm/service_isolate.cc
+++ b/runtime/vm/service_isolate.cc
@@ -301,6 +301,7 @@ class RunServiceTask : public ThreadPool::Task {
// TODO(johnmccutchan): Support starting up service isolate without embedder
// provided isolate creation callback.
if (create_callback == NULL) {
+ ServiceIsolate::SetServiceIsolate(NULL);
Cutch 2015/10/26 21:39:44 This isn't needed. The default value of the servic
zra 2015/10/26 21:49:58 Done.
ServiceIsolate::FinishedInitializing();
return;
}
@@ -319,6 +320,7 @@ class RunServiceTask : public ThreadPool::Task {
&error));
if (isolate == NULL) {
OS::PrintErr("vm-service: Isolate creation error: %s\n", error);
+ ServiceIsolate::SetServiceIsolate(NULL);
ServiceIsolate::FinishedInitializing();
return;
}
« runtime/bin/dbg_message.cc ('K') | « runtime/bin/dbg_message.cc ('k') | runtime/vm/virtual_memory.h » ('j') | runtime/vm/virtual_memory.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698