--- old/src/java.base/share/classes/jdk/internal/loader/BootLoader.java	2020-08-31 08:09:30.432035004 -0700
+++ new/src/java.base/share/classes/jdk/internal/loader/BootLoader.java	2020-08-31 08:09:30.208026573 -0700
@@ -65,7 +65,15 @@
     }
 
     // ServiceCatalog for the boot class loader
-    private static final ServicesCatalog SERVICES_CATALOG = ServicesCatalog.create();
+    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