diff options
Diffstat (limited to 'src/native/java_lang_VMClassLoader.cc')
| -rw-r--r-- | src/native/java_lang_VMClassLoader.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/native/java_lang_VMClassLoader.cc b/src/native/java_lang_VMClassLoader.cc index 0689f74986..4b5c31c64b 100644 --- a/src/native/java_lang_VMClassLoader.cc +++ b/src/native/java_lang_VMClassLoader.cc @@ -17,15 +17,15 @@ #include "class_linker.h" #include "class_loader.h" #include "jni_internal.h" -#include "scoped_jni_thread_state.h" +#include "scoped_thread_state_change.h" #include "ScopedUtfChars.h" #include "zip_archive.h" namespace art { static jclass VMClassLoader_findLoadedClass(JNIEnv* env, jclass, jobject javaLoader, jstring javaName) { - ScopedJniThreadState ts(env); - ClassLoader* loader = ts.Decode<ClassLoader*>(javaLoader); + ScopedObjectAccess soa(env); + ClassLoader* loader = soa.Decode<ClassLoader*>(javaLoader); ScopedUtfChars name(env, javaName); if (name.c_str() == NULL) { return NULL; @@ -34,7 +34,7 @@ static jclass VMClassLoader_findLoadedClass(JNIEnv* env, jclass, jobject javaLoa std::string descriptor(DotToDescriptor(name.c_str())); Class* c = Runtime::Current()->GetClassLinker()->LookupClass(descriptor.c_str(), loader); if (c != NULL && c->IsResolved()) { - return ts.AddLocalReference<jclass>(c); + return soa.AddLocalReference<jclass>(c); } else { // Class wasn't resolved so it may be erroneous or not yet ready, force the caller to go into // the regular loadClass code. |