src/java.base/share/classes/jdk/internal/module/SystemModuleFinders.java

@@ -52,11 +52,11 @@
  import java.util.function.Supplier;
  import java.util.stream.Stream;
  import java.util.stream.StreamSupport;
  
  import jdk.internal.jimage.ImageReader;
- import jdk.internal.jimage.ImageReaderFactory;
+ import jdk.internal.jimage.SystemImageReader;
  import jdk.internal.access.JavaNetUriAccess;
  import jdk.internal.access.SharedSecrets;
  import jdk.internal.util.StaticProperty;
  import jdk.internal.module.ModuleHashes.HashSupplier;
  

@@ -390,11 +390,11 @@
  
      /**
       * Holder class for the ImageReader.
       */
      private static class SystemImage {
-         static final ImageReader READER = ImageReaderFactory.getImageReader();
+         static final ImageReader READER = SystemImageReader.get();
          static ImageReader reader() {
              return READER;
          }
      }