jdk-sandbox: comparison src/hotspot/share/classfile/classLoader.cpp

equal deleted inserted replaced

-:52ef2c940423
+:b279ae9843b8
 }
 FREE_RESOURCE_ARRAY(char, path, path_len);
 return NULL;
 }
-ClassPathZipEntry::ClassPathZipEntry(jzfile* zip, const char* zip_name, bool is_boot_append) : ClassPathEntry() {
+ClassPathZipEntry::ClassPathZipEntry(jzfile* zip, const char* zip_name,
+bool is_boot_append, bool from_class_path_attr) : ClassPathEntry() {
 _zip = zip;
 char *copy = NEW_C_HEAP_ARRAY(char, strlen(zip_name)+1, mtClass);
 strcpy(copy, zip_name);
 _zip_name = copy;
+_from_class_path_attr = from_class_path_attr;
 }
 ClassPathZipEntry::~ClassPathZipEntry() {
 if (ZipClose != NULL) {
 (*ZipClose)(_zip);
 ResourceMark rm(THREAD);
 char* path = NEW_RESOURCE_ARRAY(char, end - start + 1);
 strncpy(path, &class_path[start], end - start);
 path[end - start] = '\0';
-update_class_path_entry_list(path, false, false);
+update_class_path_entry_list(path, false, false, false);
 while (class_path[end] == os::path_separator()[0]) {
 end++;
 }
 }
 vm_exit_during_initialization();
 }
 // File or directory found
 ClassPathEntry* new_entry = NULL;
 new_entry = create_class_path_entry(path, &st, true /* throw_exception */,
-false /*is_boot_append */, CHECK);
+false /*is_boot_append */, false /* from_class_path_attr */, CHECK);
 if (new_entry == NULL) {
 return;
 }
 add_to_module_path_entries(path, new_entry);
 path[end - start] = '\0';
 struct stat st;
 if (os::stat(path, &st) == 0) {
 // File or directory found
-ClassPathEntry* new_entry = create_class_path_entry(path, &st, false, false, CHECK);
+ClassPathEntry* new_entry = create_class_path_entry(path, &st, false, false, false, CHECK);
 // If the path specification is valid, enter it into this module's list
 if (new_entry != NULL) {
 module_cpl->add_to_list(new_entry);
 }
 }
 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
-ClassPathEntry* new_entry = create_class_path_entry(path, &st, false, false, CHECK);
+ClassPathEntry* new_entry = create_class_path_entry(path, &st, false, false, false, CHECK);
 // Check for a jimage
 if (Arguments::has_jimage()) {
 assert(_jrt_entry == NULL, "should not setup bootstrap class search path twice");
 _jrt_entry = new_entry;
 }
 set_base_piece = false;
 } else {
 // Every entry on the system boot class path after the initial base piece,
 // which is set by os::set_boot_path(), is considered an appended entry.
-update_class_path_entry_list(path, false, true);
+update_class_path_entry_list(path, false, true, false);
 }
 while (class_path[end] == os::path_separator()[0]) {
 end++;
 }
 jio_snprintf(path, len, "%s%cmodules%c%s", home, file_sep, file_sep, module_name);
 struct stat st;
 if (os::stat(path, &st) == 0) {
 // Directory found
-ClassPathEntry* new_entry = create_class_path_entry(path, &st, false, false, CHECK);
+ClassPathEntry* new_entry = create_class_path_entry(path, &st, false, false, false, CHECK);
 // If the path specification is valid, enter it into this module's list.
 // There is no need to check for duplicate modules in the exploded entry list,
 // since no two modules with the same name can be defined to the boot loader.
 // This is checked at module definition time in Modules::define_module.
 }
 }
 ClassPathEntry* ClassLoader::create_class_path_entry(const char *path, const struct stat* st,
 bool throw_exception,
-bool is_boot_append, TRAPS) {
+bool is_boot_append,
+bool from_class_path_attr,
+TRAPS) {
 JavaThread* thread = JavaThread::current();
 ClassPathEntry* new_entry = NULL;
 if ((st->st_mode & S_IFMT) == S_IFREG) {
 ResourceMark rm(thread);
 // Regular file, should be a zip or jimage file
 ThreadToNativeFromVM ttn(thread);
 HandleMark hm(thread);
 zip = (*ZipOpen)(canonical_path, &error_msg);
 }
 if (zip != NULL && error_msg == NULL) {
-new_entry = new ClassPathZipEntry(zip, path, is_boot_append);
+new_entry = new ClassPathZipEntry(zip, path, is_boot_append, from_class_path_attr);
 } else {
 char *msg;
 if (error_msg == NULL) {
 msg = NEW_RESOURCE_ARRAY_IN_THREAD(thread, char, strlen(path) + 128); ;
 jio_snprintf(msg, strlen(path) + 127, "error in opening JAR file %s", path);
 HandleMark hm(thread);
 zip = (*ZipOpen)(canonical_path, &error_msg);
 }
 if (zip != NULL && error_msg == NULL) {
 // create using canonical path
-return new ClassPathZipEntry(zip, canonical_path, is_boot_append);
+return new ClassPathZipEntry(zip, canonical_path, is_boot_append, false);
 }
 }
 }
 }
 return NULL;
 // Returns true IFF the file/dir exists and the entry was successfully created.
 bool ClassLoader::update_class_path_entry_list(const char *path,
 bool check_for_duplicates,
 bool is_boot_append,
+bool from_class_path_attr,
 bool throw_exception) {
 struct stat st;
 if (os::stat(path, &st) == 0) {
 // File or directory found
 ClassPathEntry* new_entry = NULL;
 Thread* THREAD = Thread::current();
-new_entry = create_class_path_entry(path, &st, throw_exception, is_boot_append, CHECK_(false));
+new_entry = create_class_path_entry(path, &st, throw_exception, is_boot_append, from_class_path_attr, CHECK_(false));
 if (new_entry == NULL) {
 return false;
 }
 // Do not reorder the bootclasspath which would break get_system_package().

changeset 55524	b279ae9843b8
parent 54927	1512d88b24c6
child 57865	489b8e142559