svn commit: r1071940 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/VelocityResult.java
Author: lukaszlenart Date: Fri Feb 18 10:29:36 2011 New Revision: 1071940 URL: http://svn.apache.org/viewvc?rev=1071940&view=rev Log: Solves WW-3577 - cache reference to JspFactory to improve performance Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/VelocityResult.java Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/VelocityResult.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/VelocityResult.java?rev=1071940&r1=1071939&r2=1071940&view=diff == --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/VelocityResult.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/VelocityResult.java Fri Feb 18 10:29:36 2011 @@ -21,16 +21,12 @@ package org.apache.struts2.dispatcher; -import java.io.OutputStreamWriter; -import java.io.Writer; - -import javax.servlet.Servlet; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.jsp.JspFactory; -import javax.servlet.jsp.PageContext; - +import com.opensymphony.xwork2.ActionContext; +import com.opensymphony.xwork2.ActionInvocation; +import com.opensymphony.xwork2.inject.Inject; +import com.opensymphony.xwork2.util.ValueStack; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; import org.apache.struts2.ServletActionContext; import org.apache.struts2.StrutsConstants; import org.apache.struts2.views.JspSupportServlet; @@ -39,12 +35,14 @@ import org.apache.velocity.Template; import org.apache.velocity.app.VelocityEngine; import org.apache.velocity.context.Context; -import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.inject.Inject; -import com.opensymphony.xwork2.util.ValueStack; -import com.opensymphony.xwork2.util.logging.Logger; -import com.opensymphony.xwork2.util.logging.LoggerFactory; +import javax.servlet.Servlet; +import javax.servlet.ServletContext; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.jsp.JspFactory; +import javax.servlet.jsp.PageContext; +import java.io.OutputStreamWriter; +import java.io.Writer; /** @@ -91,6 +89,7 @@ public class VelocityResult extends Stru private String defaultEncoding; private VelocityManager velocityManager; +private JspFactory jspFactory = JspFactory.getDefaultFactory(); public VelocityResult() { super(); @@ -124,7 +123,6 @@ public class VelocityResult extends Stru HttpServletRequest request = ServletActionContext.getRequest(); HttpServletResponse response = ServletActionContext.getResponse(); -JspFactory jspFactory = null; ServletContext servletContext = ServletActionContext.getServletContext(); Servlet servlet = JspSupportServlet.jspSupportServlet; @@ -134,7 +132,6 @@ public class VelocityResult extends Stru PageContext pageContext = (PageContext) ActionContext.getContext().get(ServletActionContext.PAGE_CONTEXT); if (pageContext == null && servlet != null) { -jspFactory = JspFactory.getDefaultFactory(); pageContext = jspFactory.getPageContext(servlet, request, response, null, true, 8192, true); ActionContext.getContext().put(ServletActionContext.PAGE_CONTEXT, pageContext); usedJspFactory = true;
[CONF] Confluence Changes in the last 24 hours
This is a daily summary of all recent changes in Confluence. - Updated Spaces: - Apache Camel (https://cwiki.apache.org/confluence/display/CAMEL) Pages - File2 edited by davsclaus (08:24 AM) https://cwiki.apache.org/confluence/display/CAMEL/File2 Release Guide edited by jstrachan (07:07 AM) https://cwiki.apache.org/confluence/display/CAMEL/Release+Guide Camel 2.7.0 Release edited by davsclaus (04:55 AM) https://cwiki.apache.org/confluence/display/CAMEL/Camel+2.7.0+Release Why can I not use when or otherwise in a Java Camel route created by davsclaus (04:52 AM) https://cwiki.apache.org/confluence/display/CAMEL/Why+can+I+not+use+when+or+otherwise+in+a+Java+Camel+route Articles edited by davsclaus (02:30 AM) https://cwiki.apache.org/confluence/display/CAMEL/Articles SERVLET edited by rkettelerij (01:57 AM) https://cwiki.apache.org/confluence/display/CAMEL/SERVLET Apache CXF Documentation (https://cwiki.apache.org/confluence/display/CXF20DOC) Pages - 2.4 Migration Guide edited by dkulp (04:57 PM) https://cwiki.apache.org/confluence/display/CXF20DOC/2.4+Migration+Guide Apache Directory client API (https://cwiki.apache.org/confluence/display/DIRAPI) Pages - DN API edited by elecharny (04:45 PM) https://cwiki.apache.org/confluence/display/DIRAPI/DN+API Apache Felix (https://cwiki.apache.org/confluence/display/FELIX) Pages - Apache Felix Service Component Runtime edited by fmeschbe (02:13 PM) https://cwiki.apache.org/confluence/display/FELIX/Apache+Felix+Service+Component+Runtime Apache Isis (https://cwiki.apache.org/confluence/display/ISIS) Pages - RecreatingMavenArchetypeFromProject edited by danhaywood (04:20 AM) https://cwiki.apache.org/confluence/display/ISIS/RecreatingMavenArchetypeFromProject Apache Mahout (https://cwiki.apache.org/confluence/display/MAHOUT) Pages - Machine Learning Resources edited by motley.crue@gmail.com (12:12 AM) https://cwiki.apache.org/confluence/display/MAHOUT/Machine+Learning+Resources Apache ActiveMQ NMS (https://cwiki.apache.org/confluence/display/NMS) Pages - Apache.NMS.ActiveMQ v1.5.0 edited by tabish121 (06:38 AM) https://cwiki.apache.org/confluence/display/NMS/Apache.NMS.ActiveMQ+v1.5.0 OFBiz Technical Documentation (https://cwiki.apache.org/confluence/display/OFBTECH) Pages - Apache OFBiz Technical Production Setup Guide edited by jacques.le.roux (11:54 AM) https://cwiki.apache.org/confluence/display/OFBTECH/Apache+OFBiz+Technical+Production+Setup+Guide OODT (https://cwiki.apache.org/confluence/display/OODT) Pages - OODT REST Services edited by chrismattmann (10:56 PM) https://cwiki.apache.org/confluence/display/OODT/OODT+REST+Services OpenEJB 3.0.x documentation (https://cwiki.apache.org/confluence/display/OPENEJBx30) Pages - Startup edited by dblevins (01:39 PM) https://cwiki.apache.org/confluence/display/OPENEJBx30/Startup OpenJPA (https://cwiki.apache.org/confluence/display/openjpa) Pages - Building and Running OpenBooks edited by kwsut...@gmail.com (11:28 AM) https://cwiki.apache.org/confluence/display/openjpa/Building+and+Running+OpenBooks Apache Struts 2 Wiki (https://cwiki.apache.org/confluence/display/S2WIKI) Pages - Welcome to Apache Struts2 edited by huyuchen...@gmail.com (01:18 AM) https://cwiki.apache.org/confluence/display/S2WIKI/Welcome+to+Apache+Struts2 Apache ServiceMix (https://cwiki.apache.org/confluence/display/SM) Pages - Roadmap created by gertvanthienen (06:33 AM) https://cwiki.apache.org/confluence/display/SM/Roadmap Related Projects edited by nanthrax (05:17 AM) https://cwiki.apache.org/confluence/display/SM/Related+Projects Apache VCL (https://cwiki.apache.org/confluence/display/VCL) Pages - Further steps if using only VMWare edited by arkurth (09:55 AM) https://cwiki.apache.org/confluence/display/VCL/Further+steps+if+using+only+VMWare Apache Wicket (https://cwiki.apache.org/