src/share/vm/oops/instanceKlass.cpp

*** 2255,2267 ****
    if (!in_unnamed_package()) {
      return _package_entry->module();
    }
    const Klass* host = host_klass();
    if (host == NULL) {
!     return class_loader_data()->modules()->unnamed_module();
    }
!   return host->class_loader_data()->modules()->unnamed_module();
  }
  
  void InstanceKlass::set_package(ClassLoaderData* loader_data, TRAPS) {
  
    // ensure java/ packages only loaded by boot or platform builtin loaders
--- 2255,2267 ----
    if (!in_unnamed_package()) {
      return _package_entry->module();
    }
    const Klass* host = host_klass();
    if (host == NULL) {
!     return class_loader_data()->unnamed_module();
    }
!   return host->class_loader_data()->unnamed_module();
  }
  
  void InstanceKlass::set_package(ClassLoaderData* loader_data, TRAPS) {
  
    // ensure java/ packages only loaded by boot or platform builtin loaders
*** 2287,2299 ****
          // in the java.base module it will be caught later when java.base
          // is defined by ModuleEntryTable::verify_javabase_packages check.
          assert(ModuleEntryTable::javabase_moduleEntry() != NULL, JAVA_BASE_NAME " module is NULL");
          _package_entry = loader_data->packages()->lookup(pkg_name, ModuleEntryTable::javabase_moduleEntry());
        } else {
!         assert(loader_data->modules()->unnamed_module() != NULL, "unnamed module is NULL");
          _package_entry = loader_data->packages()->lookup(pkg_name,
!                                                          loader_data->modules()->unnamed_module());
        }
  
        // A package should have been successfully created
        assert(_package_entry != NULL, "Package entry for class %s not found, loader %s",
               name()->as_C_string(), loader_data->loader_name());
--- 2287,2299 ----
          // in the java.base module it will be caught later when java.base
          // is defined by ModuleEntryTable::verify_javabase_packages check.
          assert(ModuleEntryTable::javabase_moduleEntry() != NULL, JAVA_BASE_NAME " module is NULL");
          _package_entry = loader_data->packages()->lookup(pkg_name, ModuleEntryTable::javabase_moduleEntry());
        } else {
!         assert(loader_data->unnamed_module() != NULL, "unnamed module is NULL");
          _package_entry = loader_data->packages()->lookup(pkg_name,
!                                                          loader_data->unnamed_module());
        }
  
        // A package should have been successfully created
        assert(_package_entry != NULL, "Package entry for class %s not found, loader %s",
               name()->as_C_string(), loader_data->loader_name());