infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-01-28 12:09:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

8374923: runtime/cds/ServiceLoaderTest.java fails with mismatch between cds and non-cds

Browse Source 
Reviewed-by: almatvee
This commit is contained in:
Alexey Semenyuk 2026-01-10 15:04:16 +00:00
parent 12894a870a
commit 659b53fe33
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/jdk.jpackage/share/classes/jdk/jpackage/internal/cli/Main.java
View File

@ -64,7 +64,7 @@ public final class Main {
}
public Provider() {
this(Main::loadBundlingEnvironment);
this(DefaultBundlingEnvironmentLoader.INSTANCE);
}
@Override
@ -104,7 +104,7 @@ public final class Main {
}
static int run(PrintWriter out, PrintWriter err, String... args) {
return run(Main::loadBundlingEnvironment, out, err, args);
return run(DefaultBundlingEnvironmentLoader.INSTANCE, out, err, args);
}
static int run(Supplier<CliBundlingEnvironment> bundlingEnvSupplier, PrintWriter out, PrintWriter err, String... args) {
@ -310,9 +310,14 @@ public final class Main {
return System.getProperty("java.version");
}
private static CliBundlingEnvironment loadBundlingEnvironment() {
return ServiceLoader.load(
CliBundlingEnvironment.class,
CliBundlingEnvironment.class.getClassLoader()).findFirst().orElseThrow();
private enum DefaultBundlingEnvironmentLoader implements Supplier<CliBundlingEnvironment> {
INSTANCE;
@Override
public CliBundlingEnvironment get() {
return ServiceLoader.load(
CliBundlingEnvironment.class,
CliBundlingEnvironment.class.getClassLoader()).findFirst().orElseThrow();
}
}
}