Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,9 @@ public ClasspathResourceLocatorStrategy(
public Location resolve(String locationSpecification, MessageHolder messageHolder) {
ClassLoader cloader = Thread.currentThread().getContextClassLoader();

URL resource = cloader.getResource(locationSpecification);
URL resource = cloader != null
? cloader.getResource(locationSpecification)
: ClassLoader.getSystemResource(locationSpecification);

Location location = null;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,24 @@ void shouldFailToResolveMissingClasspathResource() {
assertEquals(1, mh.size());
}

@Test
void shouldResolveWithSystemClassLoaderWhenContextClassLoaderIsNull() {
Thread thread = Thread.currentThread();
ClassLoader contextClassLoader = thread.getContextClassLoader();
MessageHolder messageHolder = new DefaultMessageHolder();

try {
thread.setContextClassLoader(null);
Location location =
new ClasspathResourceLocatorStrategy().resolve("META-INF/maven/test.properties", messageHolder);

assertNotNull(location);
assertEquals(0, messageHolder.size());
} finally {
thread.setContextClassLoader(contextClassLoader);
}
}

@Test
void shouldResolveExistingClasspathResourceWithoutPrecedingSlash() {
MessageHolder mh = new DefaultMessageHolder();
Expand Down