svn commit: r1071940 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/VelocityResult.java

[lu...@apache.org]

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;