From 2beeb82523bd3b8015851b69ccd088553ec0c226 Mon Sep 17 00:00:00 2001 From: Vladimir Marko Date: Mon, 20 Oct 2014 18:13:22 +0100 Subject: [PATCH] Shut down FaultManager after shutting down threads. Bug: 17703163 Change-Id: I7a8454b61e887376d019af601f3a416d18bc0760 --- runtime/runtime.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/runtime/runtime.cc b/runtime/runtime.cc index adf0994ac..d962eb58b 100644 --- a/runtime/runtime.cc +++ b/runtime/runtime.cc @@ -170,9 +170,6 @@ Runtime::~Runtime() { BackgroundMethodSamplingProfiler::Shutdown(); } - // Shutdown the fault manager if it was initialized. - fault_manager.Shutdown(); - Trace::Shutdown(); // Make sure to let the GC complete if it is running. @@ -185,6 +182,10 @@ Runtime::~Runtime() { // Make sure all other non-daemon threads have terminated, and all daemon threads are suspended. delete thread_list_; + + // Shutdown the fault manager if it was initialized. + fault_manager.Shutdown(); + delete monitor_list_; delete monitor_pool_; delete class_linker_; -- 2.11.0