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

Unified Diff: runtime/vm/service.cc

Issue 2759933005: Fix recent reload flakes (Closed)
Patch Set: Created 3 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 | « runtime/vm/isolate_reload.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/service.cc
diff --git a/runtime/vm/service.cc b/runtime/vm/service.cc
index 05f7fcdeba7ed62dbe0af5b77cf20021f312a966..eeb6d23c661a1e4db9eaa0e543704fbecc5d1fca 100644
--- a/runtime/vm/service.cc
+++ b/runtime/vm/service.cc
@@ -2543,9 +2543,11 @@ RawError* Service::MaybePause(Isolate* isolate, const Error& error) {
if (!isolate->IsPaused()) {
if (isolate->should_pause_post_service_request()) {
isolate->set_should_pause_post_service_request(false);
- // Before pausing, restore the sticky error. The debugger will return it
- // from PausePostRequest.
- Thread::Current()->set_sticky_error(error);
+ if (!error.IsNull()) {
+ // Before pausing, restore the sticky error. The debugger will return it
+ // from PausePostRequest.
+ Thread::Current()->set_sticky_error(error);
+ }
return isolate->PausePostRequest();
}
}
« no previous file with comments | « runtime/vm/isolate_reload.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698