webwork/src/main/webwork/view/velocity VelocityHelper.java,1.1,1.2

Update of /cvsroot/opensymphony/webwork/src/main/webwork/view/velocity
In directory sc8-pr-cvs1:/tmp/cvs-serv11840/src/main/webwork/view/velocity

Modified Files:
	VelocityHelper.java 
Log Message:
Create WebworkUtil once when creating Context

Index: VelocityHelper.java
===================================================================
RCS file: /cvsroot/opensymphony/webwork/src/main/webwork/view/velocity/VelocityHelper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- VelocityHelper.java	15 Nov 2003 20:08:11 -0000	1.1
+++ VelocityHelper.java	16 Nov 2003 00:58:54 -0000	1.2
@@ -8,8 +8,6 @@
 import javax.servlet.ServletContext;
 import javax.servlet.ServletResponse;
 import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
 import org.apache.velocity.app.Velocity;
 import org.apache.velocity.context.Context;
@@ -132,7 +130,6 @@
 
   public static void merge(Context context, String templateName, Writer writer)
   {
-    context.put(WEBWORK_UTIL, new WebWorkUtil(context));
     try
     {
       Template t = RuntimeSingleton.getTemplate(templateName);
@@ -167,6 +164,7 @@
       ctx = new WebWorkVelocityContext(ServletValueStack.getStack(request));
       ctx.put(REQUEST, request);
       ctx.put(RESPONSE, response);
+      ctx.put(WEBWORK_UTIL, new WebWorkUtil(ctx));
       request.setAttribute(VELO_CONTEXT, ctx);
     }
     return ctx;




-------------------------------------------------------
This SF. Net email is sponsored by: GoToMyPC
GoToMyPC is the fast, easy and secure way to access your computer from
any Web browser or wireless device. Click here to Try it Free!
https://www.gotomypc.com/tr/OSDN/AW/Q4_2003/t/g22lp?Target=mm/g22lp.tmpl