nbubna 2003/10/01 16:38:14
Modified: src/java/org/apache/velocity/tools/view/servlet
VelocityViewServlet.java
Log:
make sure requestCleanup() is called even when there's an exception during a request
Revision Changes Path
1.13 +9 -6
jakarta-velocity-tools/src/java/org/apache/velocity/tools/view/servlet/VelocityViewServlet.java
Index: VelocityViewServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity-tools/src/java/org/apache/velocity/tools/view/servlet/VelocityViewServlet.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- VelocityViewServlet.java 7 Aug 2003 03:16:41 -0000 1.12
+++ VelocityViewServlet.java 1 Oct 2003 23:38:14 -0000 1.13
@@ -191,7 +191,7 @@
* Cache of writers
*/
private static SimplePool writerPool = new SimplePool(40);
-
+
/**
* The encoding to use when generating outputing.
*/
@@ -414,10 +414,11 @@
HttpServletResponse response)
throws ServletException, IOException
{
+ Context context = null;
try
{
// first, get a context
- Context context = createContext(request, response);
+ context = createContext(request, response);
// set the content type
setContentType(request, response);
@@ -433,15 +434,17 @@
// merge the template and context
mergeTemplate(template, context, response);
-
- // call cleanup routine to let a derived class do some cleanup
- requestCleanup(request, response, context);
}
catch (Exception e)
{
// call the error handler to let the derived class
// do something useful with this failure.
error(request, response, e);
+ }
+ finally
+ {
+ // call cleanup routine to let a derived class do some cleanup
+ requestCleanup(request, response, context);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
