[velocity-tools] branch master updated: bugfix: remove references to deprecated mergeTemplate

[cbrisson]

This is an automated email from the ASF dual-hosted git repository.

cbrisson pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/velocity-tools.git


The following commit(s) were added to refs/heads/master by this push:
     new e8bc6b65 bugfix: remove references to deprecated mergeTemplate
     new edeb0aec Merge pull request #16 from andygoblins/fix_LayoutServlet
e8bc6b65 is described below

commit e8bc6b65cccb7fca85549b70205c09e8aa91724a
Author: andygoblins <andygobl...@gmx.com>
AuthorDate: Mon Sep 25 14:46:12 2023 -0500

    bugfix: remove references to deprecated mergeTemplate
    
    VelocityLayoutServlet wasn't working at all because it overwrote the 
deprecated version of mergeTemplate, which is no longer called by 
VelocityViewServlet when processing requests.
---
 .../org/apache/velocity/tools/view/VelocityLayoutServlet.java     | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git 
a/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityLayoutServlet.java
 
b/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityLayoutServlet.java
index e56aef02..3001134f 100644
--- 
a/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityLayoutServlet.java
+++ 
b/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityLayoutServlet.java
@@ -196,9 +196,11 @@ public class VelocityLayoutServlet extends 
VelocityViewServlet
      * render for handling layouts
      * @param template {@link Template} object
      * @param context Velocity context
+     * @param request servlet request
      * @param response servlet response
+     * @throws IOException
      */
-    protected void mergeTemplate(Template template, Context context,
+    protected void mergeTemplate(Template template, Context context, 
HttpServletRequest request,
                                  HttpServletResponse response)
         throws IOException
     {
@@ -248,7 +250,7 @@ public class VelocityLayoutServlet extends 
VelocityViewServlet
         }
 
         // Render the layout template into the response
-        super.mergeTemplate(template, context, response);
+        super.mergeTemplate(template, context, request, response);
     }
 
 
@@ -288,7 +290,7 @@ public class VelocityLayoutServlet extends 
VelocityViewServlet
 
             // retrieve and render the error template
             Template et = getTemplate(errorTemplate);
-            mergeTemplate(et, ctx, response);
+            mergeTemplate(et, ctx, request, response);
 
         }
         catch (Exception e2)