src/hotspot/share/classfile/javaClasses.cpp

*** 2854,2875 ****
  void java_lang_Module::set_name(oop module, oop value) {
    assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem");
    module->obj_field_put(name_offset, value);
  }
  
! ModuleEntry* java_lang_Module::module_entry(oop module, TRAPS) {
    assert(_module_entry_offset != -1, "Uninitialized module_entry_offset");
    assert(module != NULL, "module can't be null");
    assert(oopDesc::is_oop(module), "module must be oop");
  
    ModuleEntry* module_entry = (ModuleEntry*)module->address_field(_module_entry_offset);
    if (module_entry == NULL) {
      // If the inject field containing the ModuleEntry* is null then return the
      // class loader's unnamed module.
      oop loader = java_lang_Module::loader(module);
!     Handle h_loader = Handle(THREAD, loader);
!     ClassLoaderData* loader_cld = SystemDictionary::register_loader(h_loader, CHECK_NULL);
      return loader_cld->unnamed_module();
    }
    return module_entry;
  }
  
--- 2854,2875 ----
  void java_lang_Module::set_name(oop module, oop value) {
    assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem");
    module->obj_field_put(name_offset, value);
  }
  
! ModuleEntry* java_lang_Module::module_entry(oop module) {
    assert(_module_entry_offset != -1, "Uninitialized module_entry_offset");
    assert(module != NULL, "module can't be null");
    assert(oopDesc::is_oop(module), "module must be oop");
  
    ModuleEntry* module_entry = (ModuleEntry*)module->address_field(_module_entry_offset);
    if (module_entry == NULL) {
      // If the inject field containing the ModuleEntry* is null then return the
      // class loader's unnamed module.
      oop loader = java_lang_Module::loader(module);
!     Handle h_loader = Handle(Thread::current(), loader);
!     ClassLoaderData* loader_cld = SystemDictionary::register_loader(h_loader);
      return loader_cld->unnamed_module();
    }
    return module_entry;
  }