Simplified render exceptions

* Most errors result in a RuntimeException, there is no need to wrap them in another RuntimeException.
bkiers · Oct 22, 2019 · 6b34dc5 · 6b34dc5
1 parent 38e5ed3
commit 6b34dc5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/main/java/liqp/Template.java b/src/main/java/liqp/Template.java
@@ -403,7 +403,11 @@ public String renderUnguarded(final Map<String, Object> variables) {
             return rendered == null ? "" : String.valueOf(rendered);
         }
         catch (Exception e) {
-            throw new RuntimeException(e);
+            if (e instanceof RuntimeException) {
+                throw e;
+            } else {
+                throw new RuntimeException(e);
+            }
         }
     }
 

diff --git a/src/test/java/liqp/tags/IncludeTest.java b/src/test/java/liqp/tags/IncludeTest.java
@@ -134,7 +134,7 @@ public void renderTestWithIncludeSubdirectorySpecifiedInLiquidFlavorWithStrictVa
     @Test
     public void renderTestWithIncludeSubdirectorySpecifiedInLiquidFlavorWithStrictVariablesException() throws Exception {
 
-        thrown.expectCause(new NestedCauseMatcher<>(isA(VariableNotExistException.class)));
+        thrown.expectCause(isA(VariableNotExistException.class));
 
         File index = new File("src/test/jekyll/index_with_variables.html");
         Template template = Template.parse(