Skip to content

Commit 4faac1c

Browse files
committed
fix compile
1 parent 2fb8baf commit 4faac1c

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

modules/lang-painless/spi/src/test/java/org/elasticsearch/painless/WhitelistLoaderTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ public void testMissingWhitelistResourceInModule() throws Exception {
132132
JarUtils.createJarWithEntries(jar, jarEntries);
133133

134134
try (var loader = JarUtils.loadJar(jar)) {
135-
Controller controller = JarUtils.loadModule(jar, loader.classloader(), "m");
135+
Controller controller = JarUtils.loadModule(jar, loader, "m");
136136
Module module = controller.layer().findModule("m").orElseThrow();
137137

138138
Class<?> ownerClass = module.getClassLoader().loadClass("p.TestOwner");

server/src/test/java/org/elasticsearch/plugins/ExtensionLoaderTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public void testNoProvider() {
7878
public void testOneProvider() throws Exception {
7979
Map<String, CharSequence> sources = Map.of("p.FooService", defineProvider("FooService", 1));
8080
try (var loader = buildProviderJar(sources)) {
81-
TestService service = ExtensionLoader.loadSingleton(ServiceLoader.load(TestService.class, loader.classloader()))
81+
TestService service = ExtensionLoader.loadSingleton(ServiceLoader.load(TestService.class, loader))
8282
.orElseThrow(AssertionError::new);
8383
assertThat(service, not(nullValue()));
8484
assertThat(service.getValue(), equalTo(1));
@@ -95,7 +95,7 @@ public void testManyProviders() throws Exception {
9595
try (var loader = buildProviderJar(sources)) {
9696
var e = expectThrows(
9797
IllegalStateException.class,
98-
() -> ExtensionLoader.loadSingleton(ServiceLoader.load(TestService.class, loader.classloader()))
98+
() -> ExtensionLoader.loadSingleton(ServiceLoader.load(TestService.class, loader))
9999
);
100100
assertThat(e.getMessage(), containsString("More than one extension found"));
101101
assertThat(e.getMessage(), containsString("TestService"));

0 commit comments

Comments
 (0)