Provide a parent classloader for testing and containers.

spullara · spullara · commit 60d134080f7f · 2012-10-07T12:00:53.000-07:00
diff --git a/codegen/src/main/java/com/github/mustachejava/codegen/GuardCompiler.java b/codegen/src/main/java/com/github/mustachejava/codegen/GuardCompiler.java
@@ -85,9 +85,13 @@ private static Guard compile(String source, Iterable<CompilableGuard> guards) th
     return (Guard) aClass.getConstructor(Object[].class).newInstance((Object) cargs.toArray(new Object[cargs.size()]));
   }
 
-  private static final DefiningClassLoader cl = new DefiningClassLoader();
+  private static final DefiningClassLoader cl = new DefiningClassLoader(Thread.currentThread().getContextClassLoader());
 
   private static class DefiningClassLoader extends ClassLoader {
+    public DefiningClassLoader(ClassLoader parent) {
+      super(parent);
+    }
+
     public Class<?> defineClass(final String name, final byte[] b) {
       return defineClass(name, b, 0, b.length);
     }
diff --git a/compiler/src/test/java/com/github/mustachejava/util/HtmlWriterTest.java b/compiler/src/test/java/com/github/mustachejava/util/HtmlWriterTest.java
@@ -149,7 +149,7 @@ public void pragma() throws IOException {
 
   @Test
   public void twitter() throws IOException {
-    BufferedReader reader = new BufferedReader(new InputStreamReader(ClassLoader.getSystemClassLoader().getResourceAsStream("twitter.html"), "UTF-8"));
+    BufferedReader reader = new BufferedReader(new InputStreamReader(HtmlWriterTest.class.getResourceAsStream("/twitter.html"), "UTF-8"));
     char[] chars = new char[32768];
     int read;
     while ((read = reader.read(chars, 0, chars.length)) != -1) {
diff --git a/indy/src/main/java/com/github/mustachejava/indy/IndyWrapper.java b/indy/src/main/java/com/github/mustachejava/indy/IndyWrapper.java
@@ -124,8 +124,13 @@ public static String encodeClassName(String pkgName, String name) {
                             String uuid = UUID.randomUUID().toString().replace("-", "_");
                             return pkgName + "." + name + "_" + uuid;
                           }
-  private static final IndyClassLoader indyCL = new IndyClassLoader();
+  private static final IndyClassLoader indyCL = new IndyClassLoader(Thread.currentThread().getContextClassLoader());
   private static class IndyClassLoader extends ClassLoader {
+
+    public IndyClassLoader(ClassLoader parent) {
+      super(parent);
+    }
+
     public Class<?> defineClass(final String name, final byte[] b) {
       return defineClass(name, b, 0, b.length);
     }

Original file line number	Diff line number	Diff line change
`@@ -85,9 +85,13 @@ private static Guard compile(String source, Iterable<CompilableGuard> guards) th`
`85`	`85`	`return (Guard) aClass.getConstructor(Object[].class).newInstance((Object) cargs.toArray(new Object[cargs.size()]));`
`86`	`86`	`}`
`87`	`87`
`88`		`- private static final DefiningClassLoader cl = new DefiningClassLoader();`
	`88`	`+ private static final DefiningClassLoader cl = new DefiningClassLoader(Thread.currentThread().getContextClassLoader());`
`89`	`89`
`90`	`90`	`private static class DefiningClassLoader extends ClassLoader {`
	`91`	`+ public DefiningClassLoader(ClassLoader parent) {`
	`92`	`+ super(parent);`
	`93`	`+ }`
	`94`	`+`
`91`	`95`	`public Class<?> defineClass(final String name, final byte[] b) {`
`92`	`96`	`return defineClass(name, b, 0, b.length);`
`93`	`97`	`}`