Change Thread::peer_ to be a jobject instead of an Object*
Fixes issue where GC was freeing the java peer if the parent thread exited before the child thread got registered.
Change-Id: I6fbe74865d5827d243ac55fc396679afa97ff2f9
diff --git a/src/native/dalvik_system_VMStack.cc b/src/native/dalvik_system_VMStack.cc
index 091ecd6..24aa730 100644
--- a/src/native/dalvik_system_VMStack.cc
+++ b/src/native/dalvik_system_VMStack.cc
@@ -25,12 +25,10 @@
static jobject GetThreadStack(JNIEnv* env, jobject peer) {
bool timeout;
- {
+ Thread* self = Thread::Current();
+ if (env->IsSameObject(peer, self->GetPeer())) {
ScopedObjectAccess soa(env);
- Thread* self = Thread::Current();
- if (soa.Decode<Object*>(peer) == self->GetPeer()) {
- return self->CreateInternalStackTrace(soa);
- }
+ return self->CreateInternalStackTrace(soa);
}
// Suspend thread to build stack trace.
Thread* thread = Thread::SuspendForDebugger(peer, true, &timeout);