From 3244501d1dd7906a9421ed3acba1fc5e2d1ac21c Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Fri, 7 Jun 2019 09:47:34 +0200
Subject: [PATCH 2/2] Fix javacc template keyword

---
 velocity-engine-core/src/main/parser/Parser.jjt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/velocity-engine-core/src/main/parser/Parser.jjt b/velocity-engine-core/src/main/parser/Parser.jjt
index 720643d..2e7f6b3 100644
--- a/velocity-engine-core/src/main/parser/Parser.jjt
+++ b/velocity-engine-core/src/main/parser/Parser.jjt
@@ -211,12 +211,12 @@ public class Parser
      * method and re-initializing the lexer with
      * the new stream that we want parsed.
      */
-    public SimpleNode parse( Reader reader, Template template )
+    public SimpleNode parse( Reader reader, Template templateInput )
         throws ParseException
     {
         SimpleNode sn = null;
 
-        currentTemplate = template;
+        currentTemplate = templateInput;
 
         try
         {
@@ -244,7 +244,7 @@ public class Parser
              *  thrown by the Macro class when something is amiss in the
              *  Macro specification
              */
-            log.error("{}: {}", template.getName(), mee.getMessage(), mee);
+            log.error("{}: {}", templateInput.getName(), mee.getMessage(), mee);
             throw mee;
         }
         catch (ParseException pe)
@@ -259,7 +259,7 @@ public class Parser
         }
         catch (Exception e)
         {
-            String msg = template.getName() + ": " + e.getMessage();
+            String msg = templateInput.getName() + ": " + e.getMessage();
             log.error(msg, e);
             throw new VelocityException(msg, e);
         }
-- 
2.20.1