diff options
| author | Andreas Gampe <agampe@google.com> | 2015-04-13 22:14:19 -0700 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2015-04-14 13:45:04 -0700 |
| commit | f865ea9557e6fe017caf99832dc3adf9fadbf86f (patch) | |
| tree | e6b94a730b832496eaf4f652a9839ed3a78cd366 /runtime/native/java_lang_VMClassLoader.cc | |
| parent | e015a31e509c3f4de8a90b57b77329ba6609ce2f (diff) | |
| download | android_art-f865ea9557e6fe017caf99832dc3adf9fadbf86f.tar.gz android_art-f865ea9557e6fe017caf99832dc3adf9fadbf86f.tar.bz2 android_art-f865ea9557e6fe017caf99832dc3adf9fadbf86f.zip | |
ART: Make the PathClassLoader fast-path recursive
Allow an arbitrary nesting of path class-loaders. This will also
handle the fake java.lang.BootClassLoader as a class-loader object
correctly (which is of some importance to compile-time initialization).
Bug: 19781184
Bug: 19542228
Change-Id: I61f0249cf4ec8df08a83ccbd29bcf067619c28c0
Diffstat (limited to 'runtime/native/java_lang_VMClassLoader.cc')
| -rw-r--r-- | runtime/native/java_lang_VMClassLoader.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/native/java_lang_VMClassLoader.cc b/runtime/native/java_lang_VMClassLoader.cc index 35932e0b89..0c39f2b53e 100644 --- a/runtime/native/java_lang_VMClassLoader.cc +++ b/runtime/native/java_lang_VMClassLoader.cc @@ -44,8 +44,8 @@ static jclass VMClassLoader_findLoadedClass(JNIEnv* env, jclass, jobject javaLoa if (loader != nullptr) { // Try the common case. StackHandleScope<1> hs(soa.Self()); - c = cl->FindClassInPathClassLoader(soa, soa.Self(), descriptor.c_str(), descriptor_hash, - hs.NewHandle(loader)); + cl->FindClassInPathClassLoader(soa, soa.Self(), descriptor.c_str(), descriptor_hash, + hs.NewHandle(loader), &c); if (c != nullptr) { return soa.AddLocalReference<jclass>(c); } |