src/share/vm/classfile/classLoader.cpp

*** 1356,1366 ****
    // all packages of classes that have been previously loaded
    // are verified in ModuleEntryTable::verify_javabase_packages().
    if (!Universe::is_module_initialized() &&
        !ModuleEntryTable::javabase_defined() &&
        mod_entry == NULL) {
!     mod_entry = ModuleEntryTable::javabase_module();
    }
  
    // The module must be a named module
    if (mod_entry != NULL && mod_entry->is_named()) {
      int num_of_entries = module_list->length();
--- 1356,1366 ----
    // all packages of classes that have been previously loaded
    // are verified in ModuleEntryTable::verify_javabase_packages().
    if (!Universe::is_module_initialized() &&
        !ModuleEntryTable::javabase_defined() &&
        mod_entry == NULL) {
!     mod_entry = ModuleEntryTable::javabase_moduleEntry();
    }
  
    // The module must be a named module
    if (mod_entry != NULL && mod_entry->is_named()) {
      int num_of_entries = module_list->length();
*** 1706,1716 ****
      MutexLocker ml(Module_lock, THREAD);
      ModuleEntry* jb_module = null_cld_modules->locked_create_entry_or_null(Handle(NULL), vmSymbols::java_base(), NULL, NULL, null_cld);
      if (jb_module == NULL) {
        vm_exit_during_initialization("Unable to create ModuleEntry for java.base");
      }
!     ModuleEntryTable::set_javabase_module(jb_module);
    }
  }
  
  #ifndef PRODUCT
  
--- 1706,1716 ----
      MutexLocker ml(Module_lock, THREAD);
      ModuleEntry* jb_module = null_cld_modules->locked_create_entry_or_null(Handle(NULL), vmSymbols::java_base(), NULL, NULL, null_cld);
      if (jb_module == NULL) {
        vm_exit_during_initialization("Unable to create ModuleEntry for java.base");
      }
!     ModuleEntryTable::set_javabase_moduleEntry(jb_module);
    }
  }
  
  #ifndef PRODUCT