JavaMuller
diff --git a/‎builder/src/test/java/com/sampullara/mustache/UnexecuteTest.java‎
Lines changed: 3 additions & 2 deletions b/‎builder/src/test/java/com/sampullara/mustache/UnexecuteTest.java‎
Lines changed: 3 additions & 2 deletions
diff --git a/‎core/src/main/java/com/sampullara/mustache/Mustache.java‎
Lines changed: 2 additions & 4 deletions b/‎core/src/main/java/com/sampullara/mustache/Mustache.java‎
Lines changed: 2 additions & 4 deletions
diff --git a/‎…st/resources/ibis2/content.html.mustache‎ ‎…st/resources/ibis2/content.html.mustache‎builder/src/test/resources/ibis2/content.html.mustache renamed to src/test/resources/ibis2/content.html.mustache b/‎…st/resources/ibis2/content.html.mustache‎ ‎…st/resources/ibis2/content.html.mustache‎builder/src/test/resources/ibis2/content.html.mustache renamed to src/test/resources/ibis2/content.html.mustache
diff --git a/‎…est/resources/ibis2/modules/wtf.mustache‎ ‎…est/resources/ibis2/modules/wtf.mustache‎builder/src/test/resources/ibis2/modules/wtf.mustache renamed to src/test/resources/ibis2/modules/wtf.mustache b/‎…est/resources/ibis2/modules/wtf.mustache‎ ‎…est/resources/ibis2/modules/wtf.mustache‎builder/src/test/resources/ibis2/modules/wtf.mustache renamed to src/test/resources/ibis2/modules/wtf.mustache
diff --git a/‎…/network_digest_v1/content.html.mustache‎ ‎…/network_digest_v1/content.html.mustache‎builder/src/test/resources/ibis2/network_digest_v1/content.html.mustache renamed to src/test/resources/ibis2/network_digest_v1/content.html.mustache b/‎…/network_digest_v1/content.html.mustache‎ ‎…/network_digest_v1/content.html.mustache‎builder/src/test/resources/ibis2/network_digest_v1/content.html.mustache renamed to src/test/resources/ibis2/network_digest_v1/content.html.mustache
diff --git a/‎…2/network_digest_v1/content.txt.mustache‎ ‎…2/network_digest_v1/content.txt.mustache‎builder/src/test/resources/ibis2/network_digest_v1/content.txt.mustache renamed to src/test/resources/ibis2/network_digest_v1/content.txt.mustache b/‎…2/network_digest_v1/content.txt.mustache‎ ‎…2/network_digest_v1/content.txt.mustache‎builder/src/test/resources/ibis2/network_digest_v1/content.txt.mustache renamed to src/test/resources/ibis2/network_digest_v1/content.txt.mustache
diff --git a/‎…/ibis2/network_digest_v1/footer.mustache‎ ‎…/ibis2/network_digest_v1/footer.mustache‎builder/src/test/resources/ibis2/network_digest_v1/footer.mustache renamed to src/test/resources/ibis2/network_digest_v1/footer.mustache b/‎…/ibis2/network_digest_v1/footer.mustache‎ ‎…/ibis2/network_digest_v1/footer.mustache‎builder/src/test/resources/ibis2/network_digest_v1/footer.mustache renamed to src/test/resources/ibis2/network_digest_v1/footer.mustache
diff --git a/‎…2/network_digest_v1/subject.txt.mustache‎ ‎…2/network_digest_v1/subject.txt.mustache‎builder/src/test/resources/ibis2/network_digest_v1/subject.txt.mustache renamed to src/test/resources/ibis2/network_digest_v1/subject.txt.mustache b/‎…2/network_digest_v1/subject.txt.mustache‎ ‎…2/network_digest_v1/subject.txt.mustache‎builder/src/test/resources/ibis2/network_digest_v1/subject.txt.mustache renamed to src/test/resources/ibis2/network_digest_v1/subject.txt.mustache
diff --git a/‎…ilder/src/test/resources/ibis2/test.html‎ ‎src/test/resources/ibis2/test.html‎builder/src/test/resources/ibis2/test.html renamed to src/test/resources/ibis2/test.html b/‎…ilder/src/test/resources/ibis2/test.html‎ ‎src/test/resources/ibis2/test.html‎builder/src/test/resources/ibis2/test.html renamed to src/test/resources/ibis2/test.html
@@ -10,6 +10,7 @@
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.Reader;
@@ -274,7 +275,7 @@ public BufferedReader getReader(String name) throws MustacheException {
           path = "modules/" + name.split(":")[1];
         }
         try {
-          return new BufferedReader(new InputStreamReader(ClassLoader.getSystemResource("ibis2/" + path).openStream()));
+          return new BufferedReader(new FileReader(new File(root, "ibis2/" + path)));
         } catch (Exception e) {
           throw new MustacheException("Failed to open: " + path, e);
         }
@@ -305,7 +306,7 @@ protected String getContents(File root, String file) throws IOException {
   @BeforeClass
   public static void setUp() throws Exception {
     File file = new File("src/test/resources");
-    root = new File(file, "super.html").exists() ? file : new File("builder/src/test/resources");
+    root = new File(file, "simple.html").exists() ? file : new File("../src/test/resources");
   }
 
 }
@@ -74,10 +74,8 @@ protected Scope unexecute(String text, AtomicInteger position) throws MustacheEx
 
   public static Code[] truncate(Code[] codes, int start, Code[] next) {
     if (codes.length <= 1) return next;
-    int length = codes.length - start;
-    Code[] truncate = new Code[length + (next == null ? 0 : next.length)];
-    System.arraycopy(codes, start, truncate, 0, length);
-    if (next != null) System.arraycopy(next, 0, truncate, length, next.length);
+    Code[] truncate = new Code[codes.length - start];
+    System.arraycopy(codes, start, truncate, 0, truncate.length);
     return truncate;
   }
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@`
`10`	`10`	`import java.io.BufferedReader;`
`11`	`11`	`import java.io.File;`
`12`	`12`	`import java.io.FileInputStream;`
	`13`	`+import java.io.FileReader;`
`13`	`14`	`import java.io.IOException;`
`14`	`15`	`import java.io.InputStreamReader;`
`15`	`16`	`import java.io.Reader;`
`@@ -274,7 +275,7 @@ public BufferedReader getReader(String name) throws MustacheException {`
`274`	`275`	`path = "modules/" + name.split(":")[1];`
`275`	`276`	`}`
`276`	`277`	`try {`
`277`		`- return new BufferedReader(new InputStreamReader(ClassLoader.getSystemResource("ibis2/" + path).openStream()));`
	`278`	`+ return new BufferedReader(new FileReader(new File(root, "ibis2/" + path)));`
`278`	`279`	`} catch (Exception e) {`
`279`	`280`	`throw new MustacheException("Failed to open: " + path, e);`
`280`	`281`	`}`
`@@ -305,7 +306,7 @@ protected String getContents(File root, String file) throws IOException {`
`305`	`306`	`@BeforeClass`
`306`	`307`	`public static void setUp() throws Exception {`
`307`	`308`	`File file = new File("src/test/resources");`
`308`		`- root = new File(file, "super.html").exists() ? file : new File("builder/src/test/resources");`
	`309`	`+ root = new File(file, "simple.html").exists() ? file : new File("../src/test/resources");`
`309`	`310`	`}`
`310`	`311`
`311`	`312`	`}`