Author: nbubna
Date: Fri Oct 14 14:56:38 2005
New Revision: 321228
URL: http://svn.apache.org/viewcvs?rev=321228&view=rev
Log:
insert performMerge() method into mergeTemplate() as requested in JIRA Issue
VELTOOLS-7
Modified:
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/servlet/VelocityViewServlet.java
Modified:
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/servlet/VelocityViewServlet.java
URL:
http://svn.apache.org/viewcvs/jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/servlet/VelocityViewServlet.java?rev=321228&r1=321227&r2=321228&view=diff
==============================================================================
---
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/servlet/VelocityViewServlet.java
(original)
+++
jakarta/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/servlet/VelocityViewServlet.java
Fri Oct 14 14:56:38 2005
@@ -651,7 +651,7 @@
{
vw.recycle(writer);
}
- template.merge(context, vw);
+ performMerge(template, context, vw);
}
finally
{
@@ -677,6 +677,24 @@
}
}
}
+ }
+
+
+ /**
+ * This is here so developers may override it and gain access to the
+ * Writer which the template will be merged into. See
+ * <a href="http://issues.apache.org/jira/browse/VELTOOLS-7";>VELTOOLS-7</a>
+ * for discussion of this.
+ *
+ * @param template template object returned by the handleRequest() method
+ * @param context Context created by the [EMAIL PROTECTED] #createContext}
+ * @param writer a VelocityWriter that the template is merged into
+ */
+ protected void performMerge(Template template, Context context, Writer
writer)
+ throws ResourceNotFoundException, ParseErrorException,
+ MethodInvocationException, Exception
+ {
+ template.merge(context, writer);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
