From c0ca26e578b053f04f5aaae5881fec7bfcfd9be7 Mon Sep 17 00:00:00 2001 From: mdb Date: Fri, 2 Nov 2001 02:30:54 +0000 Subject: [PATCH] Have to set the application context in velocityWillInit() (which I added) so that it's around before Velocity.init() gets called, which happens in super.init(). git-svn-id: https://samskivert.googlecode.com/svn/trunk@416 6335cc39-0255-0410-8fd6-9bcaacd3b74c --- .../samskivert/velocity/DispatcherServlet.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/projects/samskivert/src/java/com/samskivert/velocity/DispatcherServlet.java b/projects/samskivert/src/java/com/samskivert/velocity/DispatcherServlet.java index 9bce98ce..9d1a50b2 100644 --- a/projects/samskivert/src/java/com/samskivert/velocity/DispatcherServlet.java +++ b/projects/samskivert/src/java/com/samskivert/velocity/DispatcherServlet.java @@ -1,5 +1,5 @@ // -// $Id: DispatcherServlet.java,v 1.6 2001/11/02 02:03:23 mdb Exp $ +// $Id: DispatcherServlet.java,v 1.7 2001/11/02 02:30:54 mdb Exp $ // // samskivert library - useful routines for java programs // Copyright (C) 2001 Michael Bayne @@ -169,10 +169,6 @@ public class DispatcherServlet extends VelocityServlet // Log.info("Initializing dispatcher servlet."); - // initialize the Velocity application context - ServletContext sctx = getServletContext(); - Velocity.setApplicationContext(sctx); - // load up our application configuration try { String appcl = config.getInitParameter(APP_CLASS_PROPS_KEY); @@ -188,8 +184,8 @@ public class DispatcherServlet extends VelocityServlet if (StringUtil.blank(logicPkg)) { logicPkg = ""; } - _app.init(sctx); - _app.postInit(sctx, logicPkg); + _app.init(getServletContext()); + _app.postInit(getServletContext(), logicPkg); } catch (Throwable t) { Log.warning("Error instantiating application."); @@ -197,6 +193,13 @@ public class DispatcherServlet extends VelocityServlet } } + // documentation inherited + protected void velocityWillInit (Properties props) + { + // stick the servlet context into the Velocity application context + Velocity.setApplicationContext(getServletContext()); + } + /** * Clean up after ourselves and our application. */