Possible to provide custom executor service

bkiers · Jan 18, 2018 · c9f1c12 · c9f1c12
1 parent f463a15
commit c9f1c12
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/main/java/liqp/Template.java b/src/main/java/liqp/Template.java
@@ -254,15 +254,17 @@ public String render(boolean convertValueToMap, String key, Object value, Object
      * @return a string denoting the rendered template.
      */
     public String render(final Map<String, Object> variables) {
+        return render(variables, Executors.newSingleThreadExecutor(), true);
+    }
+
+    public String render(final Map<String, Object> variables, ExecutorService executorService, boolean shutdown) {
 
         if (this.templateSize > this.protectionSettings.maxTemplateSizeBytes) {
             throw new RuntimeException("template exceeds " + this.protectionSettings.maxTemplateSizeBytes + " bytes");
         }
 
         final LiquidWalker walker = new LiquidWalker(new CommonTreeNodeStream(root), this.tags, this.filters, this.parseSettings.flavor);
 
-        ExecutorService executorService = Executors.newSingleThreadExecutor();
-
         Callable<String> task = new Callable<String>() {
             public String call() throws Exception {
                 try {
@@ -276,8 +278,8 @@ public String call() throws Exception {
             }
         };
 
-        Future<String> future = executorService.submit(task);
         try {
+            Future<String> future = executorService.submit(task);
             return future.get(this.protectionSettings.maxRenderTimeMillis, TimeUnit.MILLISECONDS);
         }
         catch (TimeoutException e) {
@@ -288,7 +290,9 @@ public String call() throws Exception {
             throw new RuntimeException("Oops, something unexpected happened: ", t);
         }
         finally {
-            executorService.shutdown();
+            if (shutdown) {
+                executorService.shutdown();
+            }
         }
     }