< prev index next >
src/hotspot/share/classfile/systemDictionary.cpp
Print this page
@@ -2168,11 +2168,10 @@
assert(check->is_instance_klass(), "noninstance in systemdictionary");
if ((defining == true) || (k != check)) {
linkage_error1 = "loader ";
linkage_error2 = " attempted duplicate class definition for ";
- guarantee(check->class_loader() == class_loader(), "Per construction. Else report the other loader.");
} else {
return;
}
}
@@ -3105,22 +3104,14 @@
_loader_constraints = new LoaderConstraintTable(_loader_constraint_size);
NOT_PRODUCT(SystemDictionary::verify());
}
-// Return string to give helpful intformation about a classloader.
// Caller needs ResourceMark.
const char* SystemDictionary::loader_name(const oop loader) {
-#if INCLUDE_CDS
- if (DumpSharedSpaces) {
- // Describe_external() calls assert(is_instance...) in various places,
- // which may fail with DumpSharedSpaces.
- if ((loader) == NULL) return "<bootloader>";
- return InstanceKlass::cast((loader)->klass())->name()->as_C_string();
- }
-#endif
- return java_lang_ClassLoader::describe_external(loader);
+ return ((loader) == NULL ? "<bootloader>" :
+ InstanceKlass::cast((loader)->klass())->name()->as_C_string());
}
// caller needs ResourceMark
const char* SystemDictionary::loader_name(const ClassLoaderData* loader_data) {
return (loader_data->class_loader() == NULL ? "<bootloader>" :
< prev index next >