summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Elliott Hughes <enh@google.com> 2012-03-27 15:17:42 -0700
committer Elliott Hughes <enh@google.com> 2012-03-27 15:17:42 -0700
commit534da072d3db3beecbd74e5aa23d630d73695f2c (patch)
tree7967a15e2a3963d02fd0853e0d3c1941db4c635e
parent22869a9026a08b544eca4cefd67386d347e30d2c (diff)
Reinstate code accidentally removed while moving it from ThreadList to Thread.
Change-Id: I640741a4a64bccb408ac8c053a3538588fa9a8e1
-rw-r--r--src/thread.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/thread.cc b/src/thread.cc
index 8bd7bc20a4..aee684bdec 100644
--- a/src/thread.cc
+++ b/src/thread.cc
@@ -985,6 +985,12 @@ void Thread::Destroy() {
if (peer_ != NULL) {
Thread* self = this;
+ // We may need to call user-supplied managed code.
+ SetState(Thread::kRunnable);
+
+ HandleUncaughtExceptions();
+ RemoveFromThreadGroup();
+
// this.vmData = 0;
SetVmData(peer_, NULL);