src/hotspot/share/classfile/classLoader.cpp
Index
Unified diffs
Context diffs
Sdiffs
Wdiffs
Patch
New
Old
Previous File
Next File
*** old/src/hotspot/share/classfile/classLoader.cpp Thu Oct 25 09:53:04 2018
--- new/src/hotspot/share/classfile/classLoader.cpp Thu Oct 25 09:53:04 2018
*** 1469,1488 ****
--- 1469,1484 ----
// save the path from the file: protocol or the module name from the jrt: protocol
// if no protocol prefix is found, path is the same as stream->source()
char* path = skip_uri_protocol(src);
char* canonical_class_src_path = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, char, JVM_MAXPATHLEN);
if (!get_canonical_path(path, canonical_class_src_path, JVM_MAXPATHLEN)) {
! tty->print_cr("Bad pathname %s. CDS dump aborted.", path);
vm_exit(1);
}
+ bool path_stat = get_canonical_path(path, canonical_class_src_path, JVM_MAXPATHLEN);
! assert(path_stat, "Bad src path");
for (int i = 0; i < FileMapInfo::get_number_of_shared_paths(); i++) {
SharedClassPathEntry* ent = FileMapInfo::shared_path(i);
if (!get_canonical_path(ent->name(), canonical_path_table_entry, JVM_MAXPATHLEN)) {
! tty->print_cr("Bad pathname %s. CDS dump aborted.", ent->name());
vm_exit(1);
}
+ path_stat = get_canonical_path(ent->name(), canonical_path_table_entry, JVM_MAXPATHLEN);
! assert(path_stat, "Bad shared path");
// If the path (from the class stream source) is the same as the shared
// class or module path, then we have a match.
if (strcmp(canonical_path_table_entry, canonical_class_src_path) == 0) {
// NULL pkg_entry and pkg_entry in an unnamed module implies the class
// is from the -cp or boot loader append path which consists of -Xbootclasspath/a
src/hotspot/share/classfile/classLoader.cpp
Index
Unified diffs
Context diffs
Sdiffs
Wdiffs
Patch
New
Old
Previous File
Next File