equal
deleted
inserted
replaced
1232 ResourceMark rm; |
1232 ResourceMark rm; |
1233 int path_index = ik->shared_classpath_index(); |
1233 int path_index = ik->shared_classpath_index(); |
1234 SharedClassPathEntry* ent = |
1234 SharedClassPathEntry* ent = |
1235 (SharedClassPathEntry*)FileMapInfo::shared_classpath(path_index); |
1235 (SharedClassPathEntry*)FileMapInfo::shared_classpath(path_index); |
1236 if (!Universe::is_module_initialized()) { |
1236 if (!Universe::is_module_initialized()) { |
1237 assert(ent->is_jrt(), |
1237 assert(ent != NULL && ent->is_jrt(), |
1238 "Loading non-bootstrap classes before the module system is initialized"); |
1238 "Loading non-bootstrap classes before the module system is initialized"); |
1239 assert(class_loader.is_null(), "sanity"); |
1239 assert(class_loader.is_null(), "sanity"); |
1240 return true; |
1240 return true; |
1241 } |
1241 } |
1242 // Get the pkg_entry from the classloader |
1242 // Get the pkg_entry from the classloader |
1255 mod_entry = pkg_entry->module(); |
1255 mod_entry = pkg_entry->module(); |
1256 } |
1256 } |
1257 } |
1257 } |
1258 |
1258 |
1259 if (class_loader.is_null()) { |
1259 if (class_loader.is_null()) { |
|
1260 assert(ent != NULL, "Shared class for NULL classloader must have valid SharedClassPathEntry"); |
1260 // The NULL classloader can load archived class originated from the |
1261 // The NULL classloader can load archived class originated from the |
1261 // "modules" jimage and the -Xbootclasspath/a. For class from the |
1262 // "modules" jimage and the -Xbootclasspath/a. For class from the |
1262 // "modules" jimage, the PackageEntry/ModuleEntry must be defined |
1263 // "modules" jimage, the PackageEntry/ModuleEntry must be defined |
1263 // by the NULL classloader. |
1264 // by the NULL classloader. |
1264 if (mod_entry != NULL) { |
1265 if (mod_entry != NULL) { |