From 2974a4fe5c70fc0db8eb272d8c5ea67ee8362b76 Mon Sep 17 00:00:00 2001 From: Sheikh Muhammad Talha Bin Khalid Date: Mon, 2 Nov 2026 01:39:01 +0500 Subject: [PATCH] Handle a null context classloader when resolving templates --- .../resolver/ClasspathResolver.java | 3 ++ .../resolver/ClasspathResolverTest.java | 39 +++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/compiler/src/main/java/com/github/mustachejava/resolver/ClasspathResolver.java b/compiler/src/main/java/com/github/mustachejava/resolver/ClasspathResolver.java index 579e6817..7f2a77e4 100644 --- a/compiler/src/main/java/com/github/mustachejava/resolver/ClasspathResolver.java +++ b/compiler/src/main/java/com/github/mustachejava/resolver/ClasspathResolver.java @@ -30,6 +30,9 @@ public ClasspathResolver(String resourceRoot) { @Override public Reader getReader(String resourceName) { ClassLoader ccl = Thread.currentThread().getContextClassLoader(); + if (ccl == null) { + ccl = ClasspathResolver.class.getClassLoader(); + } String fullResourceName = concatResourceRootAndResourceName(resourceName); String normalizeResourceName = URI.create(fullResourceName).normalize().getPath(); diff --git a/compiler/src/test/java/com/github/mustachejava/resolver/ClasspathResolverTest.java b/compiler/src/test/java/com/github/mustachejava/resolver/ClasspathResolverTest.java index c3622aaa..2b884cec 100644 --- a/compiler/src/test/java/com/github/mustachejava/resolver/ClasspathResolverTest.java +++ b/compiler/src/test/java/com/github/mustachejava/resolver/ClasspathResolverTest.java @@ -11,6 +11,45 @@ public class ClasspathResolverTest { + @Test + public void getReaderWithNullContextClassLoaderFindsTemplate() throws Exception { + ClassLoader savedContextClassLoader = Thread.currentThread().getContextClassLoader(); + try { + Thread.currentThread().setContextClassLoader(null); + try (Reader reader = new ClasspathResolver().getReader("template.mustache")) { + assertNotNull(reader); + } + } finally { + Thread.currentThread().setContextClassLoader(savedContextClassLoader); + } + } + + @Test + public void getReaderWithNullContextClassLoaderReturnsNullForMissingTemplate() throws Exception { + ClassLoader savedContextClassLoader = Thread.currentThread().getContextClassLoader(); + try { + Thread.currentThread().setContextClassLoader(null); + try (Reader reader = new ClasspathResolver().getReader("missing-template.mustache")) { + assertNull(reader); + } + } finally { + Thread.currentThread().setContextClassLoader(savedContextClassLoader); + } + } + + @Test + public void getReaderWithNullContextClassLoaderRejectsDirectory() throws Exception { + ClassLoader savedContextClassLoader = Thread.currentThread().getContextClassLoader(); + try { + Thread.currentThread().setContextClassLoader(null); + try (Reader reader = new ClasspathResolver().getReader("templates")) { + assertNull(reader); + } + } finally { + Thread.currentThread().setContextClassLoader(savedContextClassLoader); + } + } + @Test public void getReaderNullRootAndResourceHasRelativePath() throws Exception { ClasspathResolver underTest = new ClasspathResolver();