archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 06:45:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8212937: Parent class loader may not have a referred ClassLoaderData instance when obtained in Klass::class_in_module_of_loader

Browse source 
Fix to obtain the class loader's name from the java.lang.ClassLoader object instead of its ClassLoaderData.

Reviewed-by: coleenp, mbalao, sgehwolf
This commit is contained in:
Lois Foltan 2018-11-07 13:54:22 -05:00
parent 8872adab41
commit 9c5c6947cb
4 changed files with 198 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/hotspot/share/oops/klass.cpp
View file

@ -894,9 +894,18 @@ const char* Klass::class_in_module_of_loader(bool use_are, bool include_parent_l
if (include_parent_loader &&
!cld->is_builtin_class_loader_data()) {
oop parent_loader = java_lang_ClassLoader::parent(class_loader());
ClassLoaderData *parent_cld = ClassLoaderData::class_loader_data(parent_loader);
assert(parent_cld != NULL, "parent's class loader data should not be null");
parent_loader_name_and_id = parent_cld->loader_name_and_id();
ClassLoaderData *parent_cld = ClassLoaderData::class_loader_data_or_null(parent_loader);
// The parent loader's ClassLoaderData could be null if it is
// a delegating class loader that has never defined a class.
// In this case the loader's name must be obtained via the parent loader's oop.
if (parent_cld == NULL) {
oop cl_name_and_id = java_lang_ClassLoader::nameAndId(parent_loader);
if (cl_name_and_id != NULL) {
parent_loader_name_and_id = java_lang_String::as_utf8_string(cl_name_and_id);
}
} else {
parent_loader_name_and_id = parent_cld->loader_name_and_id();
}
parent_loader_phrase = ", parent loader ";
len += strlen(parent_loader_phrase) + strlen(parent_loader_name_and_id);
}