commit ff9b747588e77f04b07dc76b2d39a82cbfc60441
author Sebastien Hertz <shertz@google.com> Thu Feb 26 06:17:12 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Feb 26 06:17:13 2015 +0000
tree 5daf6478955d0f3c38cb10a4864bb8564b20ee97
parent f16fe893139345dad8b05b3db3e717c6f8d079d0
parent 813b9602dadeabf33439cb0592072744f6241ce5

Merge "JDWP: fix thread state on event suspension"

runtime/jdwp/jdwp_event.cc

diff --git a/runtime/jdwp/jdwp_event.cc b/runtime/jdwp/jdwp_event.cc
index b71f6cd..fc08d23 100644
--- a/runtime/jdwp/jdwp_event.cc
+++ b/runtime/jdwp/jdwp_event.cc
@@ -633,7 +633,11 @@
     AcquireJdwpTokenForEvent(threadId);
   }
   EventFinish(pReq);
-  SuspendByPolicy(suspend_policy, thread_self_id);
+  {
+    // Before suspending, we change our state to kSuspended so the debugger sees us as RUNNING.
+    ScopedThreadStateChange stsc(self, kSuspended);
+    SuspendByPolicy(suspend_policy, thread_self_id);
+  }
   self->TransitionFromSuspendedToRunnable();
 }