< prev index next >
src/hotspot/share/oops/instanceKlass.cpp
Print this page
@@ -2326,12 +2326,11 @@
}
void InstanceKlass::set_package(ClassLoaderData* loader_data, TRAPS) {
// ensure java/ packages only loaded by boot or platform builtin loaders
- Handle class_loader(THREAD, loader_data->class_loader());
- check_prohibited_package(name(), class_loader, CHECK);
+ check_prohibited_package(name(), loader_data, CHECK);
TempNewSymbol pkg_name = package_from_name(name(), CHECK);
if (pkg_name != NULL && loader_data != NULL) {
@@ -2469,22 +2468,22 @@
return(is_same_class_package(targetclassloader(), targetclassname));
}
// Only boot and platform class loaders can define classes in "java/" packages.
void InstanceKlass::check_prohibited_package(Symbol* class_name,
- Handle class_loader,
+ ClassLoaderData* loader_data,
TRAPS) {
- if (!class_loader.is_null() &&
- !SystemDictionary::is_platform_class_loader(class_loader()) &&
+ if (!loader_data->is_boot_class_loader_data() &&
+ !loader_data->is_platform_class_loader_data() &&
class_name != NULL) {
ResourceMark rm(THREAD);
char* name = class_name->as_C_string();
if (strncmp(name, JAVAPKG, JAVAPKG_LEN) == 0 && name[JAVAPKG_LEN] == '/') {
TempNewSymbol pkg_name = InstanceKlass::package_from_name(class_name, CHECK);
assert(pkg_name != NULL, "Error in parsing package name starting with 'java/'");
name = pkg_name->as_C_string();
- const char* class_loader_name = SystemDictionary::loader_name(class_loader());
+ const char* class_loader_name = loader_data->loader_name();
StringUtils::replace_no_expand(name, "/", ".");
const char* msg_text1 = "Class loader (instance of): ";
const char* msg_text2 = " tried to load prohibited package name: ";
size_t len = strlen(msg_text1) + strlen(class_loader_name) + strlen(msg_text2) + strlen(name) + 1;
char* message = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, char, len);
< prev index next >