< prev index next >
src/share/vm/classfile/classLoader.cpp
Print this page
@@ -502,11 +502,11 @@
ResourceMark rm;
const char* pkg_name = ClassLoader::package_from_name(name);
if (pkg_name != NULL) {
if (!Universe::is_module_initialized()) {
- location = (*JImageFindResource)(_jimage, "java.base", get_jimage_version_string(), name, &size);
+ location = (*JImageFindResource)(_jimage, JAVA_BASE_NAME, get_jimage_version_string(), name, &size);
#if INCLUDE_CDS
// CDS uses the boot class loader to load classes whose packages are in
// modules defined for other class loaders. So, for now, get their module
// names from the "modules" jimage file.
if (DumpSharedSpaces && location == 0) {
@@ -769,12 +769,12 @@
// The first time through the bootstrap_search setup, it must be determined
// what the base or core piece of the boot loader search is. Either a java runtime
// image is present or this is an exploded module build situation.
if (set_base_piece) {
- assert(string_ends_with(path, MODULES_IMAGE_NAME) || string_ends_with(path, "java.base"),
- "Incorrect boot loader search path, no java runtime image or java.base exploded build");
+ assert(string_ends_with(path, MODULES_IMAGE_NAME) || string_ends_with(path, JAVA_BASE_NAME),
+ "Incorrect boot loader search path, no java runtime image or " JAVA_BASE_NAME " exploded build");
struct stat st;
if (os::stat(path, &st) == 0) {
// Directory found
Thread* THREAD = Thread::current();
ClassPathEntry* new_entry = create_class_path_entry(path, &st, false, false, CHECK);
@@ -1139,11 +1139,11 @@
return; // only needed for CDS dump time
}
ResourceMark rm;
jlong size;
- JImageLocationRef location = (*JImageFindResource)(jimage, "java.base", get_jimage_version_string(), MODULE_LOADER_MAP, &size);
+ JImageLocationRef location = (*JImageFindResource)(jimage, JAVA_BASE_NAME, get_jimage_version_string(), MODULE_LOADER_MAP, &size);
if (location == 0) {
vm_exit_during_initialization(
"Cannot find ModuleLoaderMap location from modules jimage.", NULL);
}
char* buffer = NEW_RESOURCE_ARRAY(char, size + 1);
@@ -1821,11 +1821,11 @@
{
MutexLocker ml(Module_lock, THREAD);
ModuleEntry* jb_module = null_cld_modules->locked_create_entry_or_null(Handle(NULL), vmSymbols::java_base(), NULL, NULL, null_cld);
if (jb_module == NULL) {
- vm_exit_during_initialization("Unable to create ModuleEntry for java.base");
+ vm_exit_during_initialization("Unable to create ModuleEntry for " JAVA_BASE_NAME);
}
ModuleEntryTable::set_javabase_moduleEntry(jb_module);
}
}
< prev index next >