From 55256cb60e11d4fac71affb4b9760a2931a3598d Mon Sep 17 00:00:00 2001 From: Ian Rogers Date: Thu, 21 Dec 2017 17:07:11 -0800 Subject: Extensions to check JNI. Ensure critical lock isn't held when returning from a down-call. Log a warning if the critical lock is held for a significant period of time. Refactor JNIEnvExt to be a class rather than a struct. Test: mma test-art-host Change-Id: I4d149cb04d3a7308a22b92b196e51e2f1ae17ede --- openjdkjvm/OpenjdkJvm.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'openjdkjvm/OpenjdkJvm.cc') diff --git a/openjdkjvm/OpenjdkJvm.cc b/openjdkjvm/OpenjdkJvm.cc index 1b8233aae8..ff839f5126 100644 --- a/openjdkjvm/OpenjdkJvm.cc +++ b/openjdkjvm/OpenjdkJvm.cc @@ -387,7 +387,7 @@ JNIEXPORT void JVM_Interrupt(JNIEnv* env, jobject jthread) { JNIEXPORT jboolean JVM_IsInterrupted(JNIEnv* env, jobject jthread, jboolean clearInterrupted) { if (clearInterrupted) { - return static_cast(env)->self->Interrupted() ? JNI_TRUE : JNI_FALSE; + return static_cast(env)->GetSelf()->Interrupted() ? JNI_TRUE : JNI_FALSE; } else { art::ScopedFastNativeObjectAccess soa(env); art::MutexLock mu(soa.Self(), *art::Locks::thread_list_lock_); -- cgit v1.2.3-59-g8ed1b