diff options
| author | 2012-10-04 10:09:15 -0700 | |
|---|---|---|
| committer | 2012-10-05 11:07:39 -0700 | |
| commit | 50b35e2fd1a68cd1240e4a9d9f363e11764957d1 (patch) | |
| tree | 4f3c58b7b293380f19e4f33357cb352e3330772e /src/native/java_lang_Thread.cc | |
| parent | 8e9a1497f0d7da4d55f6e7ed8a7d96ba6db7222d (diff) | |
Explicitly pass Thread::Current to MutexLock and Alloc.
Change-Id: I8b75bc0617915465f102815b32306aa7760dcae4
Diffstat (limited to 'src/native/java_lang_Thread.cc')
| -rw-r--r-- | src/native/java_lang_Thread.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/native/java_lang_Thread.cc b/src/native/java_lang_Thread.cc index edf55c3c9e..cf475e280c 100644 --- a/src/native/java_lang_Thread.cc +++ b/src/native/java_lang_Thread.cc @@ -34,7 +34,7 @@ static jboolean Thread_interrupted(JNIEnv* env, jclass) { static jboolean Thread_isInterrupted(JNIEnv* env, jobject java_thread) { ScopedObjectAccess soa(env); - MutexLock mu(*Locks::thread_list_lock_); + MutexLock mu(soa.Self(), *Locks::thread_list_lock_); Thread* thread = Thread::FromManagedThread(soa, java_thread); return (thread != NULL) ? thread->IsInterrupted() : JNI_FALSE; } @@ -55,10 +55,9 @@ static jint Thread_nativeGetStatus(JNIEnv* env, jobject java_thread, jboolean ha ScopedObjectAccess soa(env); ThreadState internal_thread_state = (has_been_started ? kTerminated : kStarting); - MutexLock mu(*Locks::thread_list_lock_); + MutexLock mu(soa.Self(), *Locks::thread_list_lock_); Thread* thread = Thread::FromManagedThread(soa, java_thread); if (thread != NULL) { - MutexLock mu(*Locks::thread_suspend_count_lock_); internal_thread_state = thread->GetState(); } switch (internal_thread_state) { @@ -91,7 +90,7 @@ static jboolean Thread_nativeHoldsLock(JNIEnv* env, jobject java_thread, jobject Thread::Current()->ThrowNewException("Ljava/lang/NullPointerException;", "object == null"); return JNI_FALSE; } - MutexLock mu(*Locks::thread_list_lock_); + MutexLock mu(soa.Self(), *Locks::thread_list_lock_); Thread* thread = Thread::FromManagedThread(soa, java_thread); return thread->HoldsLock(object); } @@ -138,7 +137,7 @@ static void Thread_nativeSetName(JNIEnv* env, jobject peer, jstring java_name) { */ static void Thread_nativeSetPriority(JNIEnv* env, jobject java_thread, jint new_priority) { ScopedObjectAccess soa(env); - MutexLock mu(*Locks::thread_list_lock_); + MutexLock mu(soa.Self(), *Locks::thread_list_lock_); Thread* thread = Thread::FromManagedThread(soa, java_thread); if (thread != NULL) { thread->SetNativePriority(new_priority); |