src/java.base/share/classes/jdk/internal/loader/BootLoader.java

*** 63,73 ****
          UNNAMED_MODULE = SharedSecrets.getJavaLangAccess().defineUnnamedModule(null);
          setBootLoaderUnnamedModule0(UNNAMED_MODULE);
      }
  
      // ServiceCatalog for the boot class loader
!     private static final ServicesCatalog SERVICES_CATALOG = ServicesCatalog.create();
  
      // ClassLoaderValue map for the boot class loader
      private static final ConcurrentHashMap<?, ?> CLASS_LOADER_VALUE_MAP
          = new ConcurrentHashMap<>();
  
--- 63,81 ----
          UNNAMED_MODULE = SharedSecrets.getJavaLangAccess().defineUnnamedModule(null);
          setBootLoaderUnnamedModule0(UNNAMED_MODULE);
      }
  
      // ServiceCatalog for the boot class loader
!     private static final ServicesCatalog SERVICES_CATALOG;
!     static {
!         ArchivedClassLoaders archivedClassLoaders = ArchivedClassLoaders.get();
!         if (archivedClassLoaders != null) {
!             SERVICES_CATALOG = archivedClassLoaders.servicesCatalog(null);
!         } else {
!             SERVICES_CATALOG = ServicesCatalog.create();
!         }
!     }
  
      // ClassLoaderValue map for the boot class loader
      private static final ConcurrentHashMap<?, ?> CLASS_LOADER_VALUE_MAP
          = new ConcurrentHashMap<>();